No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Wed, Jun 25, 03:05

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

This document is not UTF8. It was detected as ISO-8859-1 (Latin 1) and converted to UTF8 for display.

	diff --git a/Doc/newdoc/Makefile b/Doc/newdoc/Makefile
	new file mode 100644
	index 0000000..367e763
	--- /dev/null
	+++ b/Doc/newdoc/Makefile
	@@ -0,0 +1,130 @@
	+# Makefile for Sphinx documentation
	+#
	+
	+# You can set these variables from the command line.
	+SPHINXOPTS =
	+SPHINXBUILD = sphinx-build
	+PAPER =
	+BUILDDIR = _build
	+
	+# Internal variables.
	+PAPEROPT_a4 = -D latex_paper_size=a4
	+PAPEROPT_letter = -D latex_paper_size=letter
	+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
	+
	+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
	+
	+help:
	+ @echo "Please use \`make <target>' where <target> is one of"
	+ @echo " html to make standalone HTML files"
	+ @echo " dirhtml to make HTML files named index.html in directories"
	+ @echo " singlehtml to make a single large HTML file"
	+ @echo " pickle to make pickle files"
	+ @echo " json to make JSON files"
	+ @echo " htmlhelp to make HTML files and a HTML help project"
	+ @echo " qthelp to make HTML files and a qthelp project"
	+ @echo " devhelp to make HTML files and a Devhelp project"
	+ @echo " epub to make an epub"
	+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
	+ @echo " latexpdf to make LaTeX files and run them through pdflatex"
	+ @echo " text to make text files"
	+ @echo " man to make manual pages"
	+ @echo " changes to make an overview of all changed/added/deprecated items"
	+ @echo " linkcheck to check all external links for integrity"
	+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
	+
	+clean:
	+ -rm -rf $(BUILDDIR)/*
	+
	+html:
	+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
	+ @echo
	+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
	+
	+dirhtml:
	+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
	+ @echo
	+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
	+
	+singlehtml:
	+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
	+ @echo
	+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
	+
	+pickle:
	+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
	+ @echo
	+ @echo "Build finished; now you can process the pickle files."
	+
	+json:
	+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
	+ @echo
	+ @echo "Build finished; now you can process the JSON files."
	+
	+htmlhelp:
	+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
	+ @echo
	+ @echo "Build finished; now you can run HTML Help Workshop with the" \
	+ ".hhp project file in $(BUILDDIR)/htmlhelp."
	+
	+qthelp:
	+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
	+ @echo
	+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
	+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
	+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pNbody.qhcp"
	+ @echo "To view the help file:"
	+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pNbody.qhc"
	+
	+devhelp:
	+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
	+ @echo
	+ @echo "Build finished."
	+ @echo "To view the help file:"
	+ @echo "# mkdir -p $$HOME/.local/share/devhelp/pNbody"
	+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pNbody"
	+ @echo "# devhelp"
	+
	+epub:
	+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
	+ @echo
	+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
	+
	+latex:
	+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
	+ @echo
	+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
	+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
	+ "(use \`make latexpdf' here to do that automatically)."
	+
	+latexpdf:
	+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
	+ @echo "Running LaTeX files through pdflatex..."
	+ make -C $(BUILDDIR)/latex all-pdf
	+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
	+
	+text:
	+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
	+ @echo
	+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
	+
	+man:
	+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
	+ @echo
	+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
	+
	+changes:
	+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
	+ @echo
	+ @echo "The overview file is in $(BUILDDIR)/changes."
	+
	+linkcheck:
	+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
	+ @echo
	+ @echo "Link check complete; look for any errors in the above output " \
	+ "or in $(BUILDDIR)/linkcheck/output.txt."
	+
	+doctest:
	+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
	+ @echo "Testing of doctests in the sources finished, look at the " \
	+ "results in $(BUILDDIR)/doctest/output.txt."
	diff --git a/Doc/newdoc/_build/doctrees/environment.pickle b/Doc/newdoc/_build/doctrees/environment.pickle
	new file mode 100644
	index 0000000..171d237
	Binary files /dev/null and b/Doc/newdoc/_build/doctrees/environment.pickle differ
	diff --git a/Doc/newdoc/_build/doctrees/index.doctree b/Doc/newdoc/_build/doctrees/index.doctree
	new file mode 100644
	index 0000000..a656567
	Binary files /dev/null and b/Doc/newdoc/_build/doctrees/index.doctree differ
	diff --git a/Doc/newdoc/_build/doctrees/rst/Io.doctree b/Doc/newdoc/_build/doctrees/rst/Io.doctree
	new file mode 100644
	index 0000000..23c59f8
	Binary files /dev/null and b/Doc/newdoc/_build/doctrees/rst/Io.doctree differ
	diff --git a/Doc/newdoc/_build/doctrees/rst/Overview.doctree b/Doc/newdoc/_build/doctrees/rst/Overview.doctree
	new file mode 100644
	index 0000000..3d13f43
	Binary files /dev/null and b/Doc/newdoc/_build/doctrees/rst/Overview.doctree differ
	diff --git a/Doc/newdoc/_build/html/.buildinfo b/Doc/newdoc/_build/html/.buildinfo
	new file mode 100644
	index 0000000..87377a9
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/.buildinfo
	@@ -0,0 +1,4 @@
	+# Sphinx build info version 1
	+# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
	+config: 362a13e370e17ef1dfab95a3a88567c5
	+tags: fbb0d17656682115ca4d033fb2f83ba1
	diff --git a/Doc/newdoc/_build/html/_sources/index.txt b/Doc/newdoc/_build/html/_sources/index.txt
	new file mode 100644
	index 0000000..28288c5
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/_sources/index.txt
	@@ -0,0 +1,23 @@
	+.. pNbody documentation master file, created by
	+ sphinx-quickstart on Wed Aug 24 16:29:02 2011.
	+ You can adapt this file completely to your liking, but it should at least
	+ contain the root `toctree` directive.
	+
	+Welcome to pNbody's documentation!
	+==================================
	+
	+Contents:
	+
	+.. toctree::
	+ :maxdepth: 2
	+
	+ rst/Overview
	+ rst/Io
	+
	+Indices and tables
	+==================
	+
	+* :ref:`genindex`
	+* :ref:`modindex`
	+* :ref:`search`
	+
	diff --git a/Doc/newdoc/_build/html/_sources/rst/Io.txt b/Doc/newdoc/_build/html/_sources/rst/Io.txt
	new file mode 100644
	index 0000000..66371f5
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/_sources/rst/Io.txt
	@@ -0,0 +1,11 @@
	+the Io module
	+**********************
	+
	+.. currentmodule:: pNbody.io
	+
	+.. autofunction:: checkfile
	+.. autofunction:: end_of_file
	+.. autofunction:: write_array
	+
	+.. autofunction:: testfct
	+
	diff --git a/Doc/newdoc/_build/html/_sources/rst/Overview.txt b/Doc/newdoc/_build/html/_sources/rst/Overview.txt
	new file mode 100644
	index 0000000..cf5b28c
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/_sources/rst/Overview.txt
	@@ -0,0 +1,7 @@
	+Overview
	+**********************
	+
	+
	+.. currentmodule:: pNbody.io
	+
	+
	diff --git a/Doc/newdoc/_build/html/_static/basic.css b/Doc/newdoc/_build/html/_static/basic.css
	new file mode 100644
	index 0000000..69f30d4
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/_static/basic.css
	@@ -0,0 +1,509 @@
	+/*
	+ * basic.css
	+ * ~~~~~~~~~
	+ *
	+ * Sphinx stylesheet -- basic theme.
	+ *
	+ * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
	+ * :license: BSD, see LICENSE for details.
	+ *
	+ */
	+
	+/* -- main layout ----------------------------------------------------------- */
	+
	+div.clearer {
	+ clear: both;
	+}
	+
	+/* -- relbar ---------------------------------------------------------------- */
	+
	+div.related {
	+ width: 100%;
	+ font-size: 90%;
	+}
	+
	+div.related h3 {
	+ display: none;
	+}
	+
	+div.related ul {
	+ margin: 0;
	+ padding: 0 0 0 10px;
	+ list-style: none;
	+}
	+
	+div.related li {
	+ display: inline;
	+}
	+
	+div.related li.right {
	+ float: right;
	+ margin-right: 5px;
	+}
	+
	+/* -- sidebar --------------------------------------------------------------- */
	+
	+div.sphinxsidebarwrapper {
	+ padding: 10px 5px 0 10px;
	+}
	+
	+div.sphinxsidebar {
	+ float: left;
	+ width: 230px;
	+ margin-left: -100%;
	+ font-size: 90%;
	+}
	+
	+div.sphinxsidebar ul {
	+ list-style: none;
	+}
	+
	+div.sphinxsidebar ul ul,
	+div.sphinxsidebar ul.want-points {
	+ margin-left: 20px;
	+ list-style: square;
	+}
	+
	+div.sphinxsidebar ul ul {
	+ margin-top: 0;
	+ margin-bottom: 0;
	+}
	+
	+div.sphinxsidebar form {
	+ margin-top: 10px;
	+}
	+
	+div.sphinxsidebar input {
	+ border: 1px solid #98dbcc;
	+ font-family: sans-serif;
	+ font-size: 1em;
	+}
	+
	+img {
	+ border: 0;
	+}
	+
	+/* -- search page ----------------------------------------------------------- */
	+
	+ul.search {
	+ margin: 10px 0 0 20px;
	+ padding: 0;
	+}
	+
	+ul.search li {
	+ padding: 5px 0 5px 20px;
	+ background-image: url(file.png);
	+ background-repeat: no-repeat;
	+ background-position: 0 7px;
	+}
	+
	+ul.search li a {
	+ font-weight: bold;
	+}
	+
	+ul.search li div.context {
	+ color: #888;
	+ margin: 2px 0 0 30px;
	+ text-align: left;
	+}
	+
	+ul.keywordmatches li.goodmatch a {
	+ font-weight: bold;
	+}
	+
	+/* -- index page ------------------------------------------------------------ */
	+
	+table.contentstable {
	+ width: 90%;
	+}
	+
	+table.contentstable p.biglink {
	+ line-height: 150%;
	+}
	+
	+a.biglink {
	+ font-size: 1.3em;
	+}
	+
	+span.linkdescr {
	+ font-style: italic;
	+ padding-top: 5px;
	+ font-size: 90%;
	+}
	+
	+/* -- general index --------------------------------------------------------- */
	+
	+table.indextable {
	+ width: 100%;
	+}
	+
	+table.indextable td {
	+ text-align: left;
	+ vertical-align: top;
	+}
	+
	+table.indextable dl, table.indextable dd {
	+ margin-top: 0;
	+ margin-bottom: 0;
	+}
	+
	+table.indextable tr.pcap {
	+ height: 10px;
	+}
	+
	+table.indextable tr.cap {
	+ margin-top: 10px;
	+ background-color: #f2f2f2;
	+}
	+
	+img.toggler {
	+ margin-right: 3px;
	+ margin-top: 3px;
	+ cursor: pointer;
	+}
	+
	+div.modindex-jumpbox {
	+ border-top: 1px solid #ddd;
	+ border-bottom: 1px solid #ddd;
	+ margin: 1em 0 1em 0;
	+ padding: 0.4em;
	+}
	+
	+div.genindex-jumpbox {
	+ border-top: 1px solid #ddd;
	+ border-bottom: 1px solid #ddd;
	+ margin: 1em 0 1em 0;
	+ padding: 0.4em;
	+}
	+
	+/* -- general body styles --------------------------------------------------- */
	+
	+a.headerlink {
	+ visibility: hidden;
	+}
	+
	+h1:hover > a.headerlink,
	+h2:hover > a.headerlink,
	+h3:hover > a.headerlink,
	+h4:hover > a.headerlink,
	+h5:hover > a.headerlink,
	+h6:hover > a.headerlink,
	+dt:hover > a.headerlink {
	+ visibility: visible;
	+}
	+
	+div.body p.caption {
	+ text-align: inherit;
	+}
	+
	+div.body td {
	+ text-align: left;
	+}
	+
	+.field-list ul {
	+ padding-left: 1em;
	+}
	+
	+.first {
	+ margin-top: 0 !important;
	+}
	+
	+p.rubric {
	+ margin-top: 30px;
	+ font-weight: bold;
	+}
	+
	+.align-left {
	+ text-align: left;
	+}
	+
	+.align-center {
	+ clear: both;
	+ text-align: center;
	+}
	+
	+.align-right {
	+ text-align: right;
	+}
	+
	+/* -- sidebars -------------------------------------------------------------- */
	+
	+div.sidebar {
	+ margin: 0 0 0.5em 1em;
	+ border: 1px solid #ddb;
	+ padding: 7px 7px 0 7px;
	+ background-color: #ffe;
	+ width: 40%;
	+ float: right;
	+}
	+
	+p.sidebar-title {
	+ font-weight: bold;
	+}
	+
	+/* -- topics ---------------------------------------------------------------- */
	+
	+div.topic {
	+ border: 1px solid #ccc;
	+ padding: 7px 7px 0 7px;
	+ margin: 10px 0 10px 0;
	+}
	+
	+p.topic-title {
	+ font-size: 1.1em;
	+ font-weight: bold;
	+ margin-top: 10px;
	+}
	+
	+/* -- admonitions ----------------------------------------------------------- */
	+
	+div.admonition {
	+ margin-top: 10px;
	+ margin-bottom: 10px;
	+ padding: 7px;
	+}
	+
	+div.admonition dt {
	+ font-weight: bold;
	+}
	+
	+div.admonition dl {
	+ margin-bottom: 0;
	+}
	+
	+p.admonition-title {
	+ margin: 0px 10px 5px 0px;
	+ font-weight: bold;
	+}
	+
	+div.body p.centered {
	+ text-align: center;
	+ margin-top: 25px;
	+}
	+
	+/* -- tables ---------------------------------------------------------------- */
	+
	+table.docutils {
	+ border: 0;
	+ border-collapse: collapse;
	+}
	+
	+table.docutils td, table.docutils th {
	+ padding: 1px 8px 1px 5px;
	+ border-top: 0;
	+ border-left: 0;
	+ border-right: 0;
	+ border-bottom: 1px solid #aaa;
	+}
	+
	+table.field-list td, table.field-list th {
	+ border: 0 !important;
	+}
	+
	+table.footnote td, table.footnote th {
	+ border: 0 !important;
	+}
	+
	+th {
	+ text-align: left;
	+ padding-right: 5px;
	+}
	+
	+table.citation {
	+ border-left: solid 1px gray;
	+ margin-left: 1px;
	+}
	+
	+table.citation td {
	+ border-bottom: none;
	+}
	+
	+/* -- other body styles ----------------------------------------------------- */
	+
	+ol.arabic {
	+ list-style: decimal;
	+}
	+
	+ol.loweralpha {
	+ list-style: lower-alpha;
	+}
	+
	+ol.upperalpha {
	+ list-style: upper-alpha;
	+}
	+
	+ol.lowerroman {
	+ list-style: lower-roman;
	+}
	+
	+ol.upperroman {
	+ list-style: upper-roman;
	+}
	+
	+dl {
	+ margin-bottom: 15px;
	+}
	+
	+dd p {
	+ margin-top: 0px;
	+}
	+
	+dd ul, dd table {
	+ margin-bottom: 10px;
	+}
	+
	+dd {
	+ margin-top: 3px;
	+ margin-bottom: 10px;
	+ margin-left: 30px;
	+}
	+
	+dt:target, .highlighted {
	+ background-color: #fbe54e;
	+}
	+
	+dl.glossary dt {
	+ font-weight: bold;
	+ font-size: 1.1em;
	+}
	+
	+.field-list ul {
	+ margin: 0;
	+ padding-left: 1em;
	+}
	+
	+.field-list p {
	+ margin: 0;
	+}
	+
	+.refcount {
	+ color: #060;
	+}
	+
	+.optional {
	+ font-size: 1.3em;
	+}
	+
	+.versionmodified {
	+ font-style: italic;
	+}
	+
	+.system-message {
	+ background-color: #fda;
	+ padding: 5px;
	+ border: 3px solid red;
	+}
	+
	+.footnote:target {
	+ background-color: #ffa
	+}
	+
	+.line-block {
	+ display: block;
	+ margin-top: 1em;
	+ margin-bottom: 1em;
	+}
	+
	+.line-block .line-block {
	+ margin-top: 0;
	+ margin-bottom: 0;
	+ margin-left: 1.5em;
	+}
	+
	+.guilabel, .menuselection {
	+ font-family: sans-serif;
	+}
	+
	+.accelerator {
	+ text-decoration: underline;
	+}
	+
	+.classifier {
	+ font-style: oblique;
	+}
	+
	+/* -- code displays --------------------------------------------------------- */
	+
	+pre {
	+ overflow: auto;
	+}
	+
	+td.linenos pre {
	+ padding: 5px 0px;
	+ border: 0;
	+ background-color: transparent;
	+ color: #aaa;
	+}
	+
	+table.highlighttable {
	+ margin-left: 0.5em;
	+}
	+
	+table.highlighttable td {
	+ padding: 0 0.5em 0 0.5em;
	+}
	+
	+tt.descname {
	+ background-color: transparent;
	+ font-weight: bold;
	+ font-size: 1.2em;
	+}
	+
	+tt.descclassname {
	+ background-color: transparent;
	+}
	+
	+tt.xref, a tt {
	+ background-color: transparent;
	+ font-weight: bold;
	+}
	+
	+h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
	+ background-color: transparent;
	+}
	+
	+.viewcode-link {
	+ float: right;
	+}
	+
	+.viewcode-back {
	+ float: right;
	+ font-family: sans-serif;
	+}
	+
	+div.viewcode-block:target {
	+ margin: -1px -10px;
	+ padding: 0 10px;
	+}
	+
	+/* -- math display ---------------------------------------------------------- */
	+
	+img.math {
	+ vertical-align: middle;
	+}
	+
	+div.body div.math p {
	+ text-align: center;
	+}
	+
	+span.eqno {
	+ float: right;
	+}
	+
	+/* -- printout stylesheet --------------------------------------------------- */
	+
	+@media print {
	+ div.document,
	+ div.documentwrapper,
	+ div.bodywrapper {
	+ margin: 0 !important;
	+ width: 100%;
	+ }
	+
	+ div.sphinxsidebar,
	+ div.related,
	+ div.footer,
	+ #top-link {
	+ display: none;
	+ }
	+}
	diff --git a/Doc/newdoc/_build/html/_static/default.css b/Doc/newdoc/_build/html/_static/default.css
	new file mode 100644
	index 0000000..2a3ac13
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/_static/default.css
	@@ -0,0 +1,256 @@
	+/*
	+ * default.css_t
	+ * ~~~~~~~~~~~~~
	+ *
	+ * Sphinx stylesheet -- default theme.
	+ *
	+ * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
	+ * :license: BSD, see LICENSE for details.
	+ *
	+ */
	+
	+@import url("basic.css");
	+
	+/* -- page layout ----------------------------------------------------------- */
	+
	+body {
	+ font-family: sans-serif;
	+ font-size: 100%;
	+ background-color: #11303d;
	+ color: #000;
	+ margin: 0;
	+ padding: 0;
	+}
	+
	+div.document {
	+ background-color: #1c4e63;
	+}
	+
	+div.documentwrapper {
	+ float: left;
	+ width: 100%;
	+}
	+
	+div.bodywrapper {
	+ margin: 0 0 0 230px;
	+}
	+
	+div.body {
	+ background-color: #ffffff;
	+ color: #000000;
	+ padding: 0 20px 30px 20px;
	+}
	+
	+div.footer {
	+ color: #ffffff;
	+ width: 100%;
	+ padding: 9px 0 9px 0;
	+ text-align: center;
	+ font-size: 75%;
	+}
	+
	+div.footer a {
	+ color: #ffffff;
	+ text-decoration: underline;
	+}
	+
	+div.related {
	+ background-color: #133f52;
	+ line-height: 30px;
	+ color: #ffffff;
	+}
	+
	+div.related a {
	+ color: #ffffff;
	+}
	+
	+div.sphinxsidebar {
	+}
	+
	+div.sphinxsidebar h3 {
	+ font-family: 'Trebuchet MS', sans-serif;
	+ color: #ffffff;
	+ font-size: 1.4em;
	+ font-weight: normal;
	+ margin: 0;
	+ padding: 0;
	+}
	+
	+div.sphinxsidebar h3 a {
	+ color: #ffffff;
	+}
	+
	+div.sphinxsidebar h4 {
	+ font-family: 'Trebuchet MS', sans-serif;
	+ color: #ffffff;
	+ font-size: 1.3em;
	+ font-weight: normal;
	+ margin: 5px 0 0 0;
	+ padding: 0;
	+}
	+
	+div.sphinxsidebar p {
	+ color: #ffffff;
	+}
	+
	+div.sphinxsidebar p.topless {
	+ margin: 5px 10px 10px 10px;
	+}
	+
	+div.sphinxsidebar ul {
	+ margin: 10px;
	+ padding: 0;
	+ color: #ffffff;
	+}
	+
	+div.sphinxsidebar a {
	+ color: #98dbcc;
	+}
	+
	+div.sphinxsidebar input {
	+ border: 1px solid #98dbcc;
	+ font-family: sans-serif;
	+ font-size: 1em;
	+}
	+
	+
	+
	+/* -- hyperlink styles ------------------------------------------------------ */
	+
	+a {
	+ color: #355f7c;
	+ text-decoration: none;
	+}
	+
	+a:visited {
	+ color: #355f7c;
	+ text-decoration: none;
	+}
	+
	+a:hover {
	+ text-decoration: underline;
	+}
	+
	+
	+
	+/* -- body styles ----------------------------------------------------------- */
	+
	+div.body h1,
	+div.body h2,
	+div.body h3,
	+div.body h4,
	+div.body h5,
	+div.body h6 {
	+ font-family: 'Trebuchet MS', sans-serif;
	+ background-color: #f2f2f2;
	+ font-weight: normal;
	+ color: #20435c;
	+ border-bottom: 1px solid #ccc;
	+ margin: 20px -20px 10px -20px;
	+ padding: 3px 0 3px 10px;
	+}
	+
	+div.body h1 { margin-top: 0; font-size: 200%; }
	+div.body h2 { font-size: 160%; }
	+div.body h3 { font-size: 140%; }
	+div.body h4 { font-size: 120%; }
	+div.body h5 { font-size: 110%; }
	+div.body h6 { font-size: 100%; }
	+
	+a.headerlink {
	+ color: #c60f0f;
	+ font-size: 0.8em;
	+ padding: 0 4px 0 4px;
	+ text-decoration: none;
	+}
	+
	+a.headerlink:hover {
	+ background-color: #c60f0f;
	+ color: white;
	+}
	+
	+div.body p, div.body dd, div.body li {
	+ text-align: justify;
	+ line-height: 130%;
	+}
	+
	+div.admonition p.admonition-title + p {
	+ display: inline;
	+}
	+
	+div.admonition p {
	+ margin-bottom: 5px;
	+}
	+
	+div.admonition pre {
	+ margin-bottom: 5px;
	+}
	+
	+div.admonition ul, div.admonition ol {
	+ margin-bottom: 5px;
	+}
	+
	+div.note {
	+ background-color: #eee;
	+ border: 1px solid #ccc;
	+}
	+
	+div.seealso {
	+ background-color: #ffc;
	+ border: 1px solid #ff6;
	+}
	+
	+div.topic {
	+ background-color: #eee;
	+}
	+
	+div.warning {
	+ background-color: #ffe4e4;
	+ border: 1px solid #f66;
	+}
	+
	+p.admonition-title {
	+ display: inline;
	+}
	+
	+p.admonition-title:after {
	+ content: ":";
	+}
	+
	+pre {
	+ padding: 5px;
	+ background-color: #eeffcc;
	+ color: #333333;
	+ line-height: 120%;
	+ border: 1px solid #ac9;
	+ border-left: none;
	+ border-right: none;
	+}
	+
	+tt {
	+ background-color: #ecf0f3;
	+ padding: 0 1px 0 1px;
	+ font-size: 0.95em;
	+}
	+
	+th {
	+ background-color: #ede;
	+}
	+
	+.warning tt {
	+ background: #efc2c2;
	+}
	+
	+.note tt {
	+ background: #d6d6d6;
	+}
	+
	+.viewcode-back {
	+ font-family: sans-serif;
	+}
	+
	+div.viewcode-block:target {
	+ background-color: #f4debf;
	+ border-top: 1px solid #ac9;
	+ border-bottom: 1px solid #ac9;
	+}
	\ No newline at end of file
	diff --git a/Doc/newdoc/_build/html/_static/doctools.js b/Doc/newdoc/_build/html/_static/doctools.js
	new file mode 100644
	index 0000000..eeea95e
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/_static/doctools.js
	@@ -0,0 +1,247 @@
	+/*
	+ * doctools.js
	+ * ~~~~~~~~~~~
	+ *
	+ * Sphinx JavaScript utilties for all documentation.
	+ *
	+ * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
	+ * :license: BSD, see LICENSE for details.
	+ *
	+ */
	+
	+/**
	+ * select a different prefix for underscore
	+ */
	+$u = _.noConflict();
	+
	+/**
	+ * make the code below compatible with browsers without
	+ * an installed firebug like debugger
	+if (!window.console \|\| !console.firebug) {
	+ var names = ["log", "debug", "info", "warn", "error", "assert", "dir",
	+ "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace",
	+ "profile", "profileEnd"];
	+ window.console = {};
	+ for (var i = 0; i < names.length; ++i)
	+ window.console[names[i]] = function() {};
	+}
	+ */
	+
	+/**
	+ * small helper function to urldecode strings
	+ */
	+jQuery.urldecode = function(x) {
	+ return decodeURIComponent(x).replace(/\+/g, ' ');
	+}
	+
	+/**
	+ * small helper function to urlencode strings
	+ */
	+jQuery.urlencode = encodeURIComponent;
	+
	+/**
	+ * This function returns the parsed url parameters of the
	+ * current request. Multiple values per key are supported,
	+ * it will always return arrays of strings for the value parts.
	+ */
	+jQuery.getQueryParameters = function(s) {
	+ if (typeof s == 'undefined')
	+ s = document.location.search;
	+ var parts = s.substr(s.indexOf('?') + 1).split('&');
	+ var result = {};
	+ for (var i = 0; i < parts.length; i++) {
	+ var tmp = parts[i].split('=', 2);
	+ var key = jQuery.urldecode(tmp[0]);
	+ var value = jQuery.urldecode(tmp[1]);
	+ if (key in result)
	+ result[key].push(value);
	+ else
	+ result[key] = [value];
	+ }
	+ return result;
	+};
	+
	+/**
	+ * small function to check if an array contains
	+ * a given item.
	+ */
	+jQuery.contains = function(arr, item) {
	+ for (var i = 0; i < arr.length; i++) {
	+ if (arr[i] == item)
	+ return true;
	+ }
	+ return false;
	+};
	+
	+/**
	+ * highlight a given string on a jquery object by wrapping it in
	+ * span elements with the given class name.
	+ */
	+jQuery.fn.highlightText = function(text, className) {
	+ function highlight(node) {
	+ if (node.nodeType == 3) {
	+ var val = node.nodeValue;
	+ var pos = val.toLowerCase().indexOf(text);
	+ if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
	+ var span = document.createElement("span");
	+ span.className = className;
	+ span.appendChild(document.createTextNode(val.substr(pos, text.length)));
	+ node.parentNode.insertBefore(span, node.parentNode.insertBefore(
	+ document.createTextNode(val.substr(pos + text.length)),
	+ node.nextSibling));
	+ node.nodeValue = val.substr(0, pos);
	+ }
	+ }
	+ else if (!jQuery(node).is("button, select, textarea")) {
	+ jQuery.each(node.childNodes, function() {
	+ highlight(this);
	+ });
	+ }
	+ }
	+ return this.each(function() {
	+ highlight(this);
	+ });
	+};
	+
	+/**
	+ * Small JavaScript module for the documentation.
	+ */
	+var Documentation = {
	+
	+ init : function() {
	+ this.fixFirefoxAnchorBug();
	+ this.highlightSearchWords();
	+ this.initIndexTable();
	+ },
	+
	+ /**
	+ * i18n support
	+ */
	+ TRANSLATIONS : {},
	+ PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
	+ LOCALE : 'unknown',
	+
	+ // gettext and ngettext don't access this so that the functions
	+ // can safely bound to a different name (_ = Documentation.gettext)
	+ gettext : function(string) {
	+ var translated = Documentation.TRANSLATIONS[string];
	+ if (typeof translated == 'undefined')
	+ return string;
	+ return (typeof translated == 'string') ? translated : translated[0];
	+ },
	+
	+ ngettext : function(singular, plural, n) {
	+ var translated = Documentation.TRANSLATIONS[singular];
	+ if (typeof translated == 'undefined')
	+ return (n == 1) ? singular : plural;
	+ return translated[Documentation.PLURALEXPR(n)];
	+ },
	+
	+ addTranslations : function(catalog) {
	+ for (var key in catalog.messages)
	+ this.TRANSLATIONS[key] = catalog.messages[key];
	+ this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')');
	+ this.LOCALE = catalog.locale;
	+ },
	+
	+ /**
	+ * add context elements like header anchor links
	+ */
	+ addContextElements : function() {
	+ $('div[id] > :header:first').each(function() {
	+ $('<a class="headerlink">\u00B6</a>').
	+ attr('href', '#' + this.id).
	+ attr('title', _('Permalink to this headline')).
	+ appendTo(this);
	+ });
	+ $('dt[id]').each(function() {
	+ $('<a class="headerlink">\u00B6</a>').
	+ attr('href', '#' + this.id).
	+ attr('title', _('Permalink to this definition')).
	+ appendTo(this);
	+ });
	+ },
	+
	+ /**
	+ * workaround a firefox stupidity
	+ */
	+ fixFirefoxAnchorBug : function() {
	+ if (document.location.hash && $.browser.mozilla)
	+ window.setTimeout(function() {
	+ document.location.href += '';
	+ }, 10);
	+ },
	+
	+ /**
	+ * highlight the search words provided in the url in the text
	+ */
	+ highlightSearchWords : function() {
	+ var params = $.getQueryParameters();
	+ var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : [];
	+ if (terms.length) {
	+ var body = $('div.body');
	+ window.setTimeout(function() {
	+ $.each(terms, function() {
	+ body.highlightText(this.toLowerCase(), 'highlighted');
	+ });
	+ }, 10);
	+ $('<li class="highlight-link"><a href="javascript:Documentation.' +
	+ 'hideSearchWords()">' + _('Hide Search Matches') + '</a></li>')
	+ .appendTo($('.sidebar .this-page-menu'));
	+ }
	+ },
	+
	+ /**
	+ * init the domain index toggle buttons
	+ */
	+ initIndexTable : function() {
	+ var togglers = $('img.toggler').click(function() {
	+ var src = $(this).attr('src');
	+ var idnum = $(this).attr('id').substr(7);
	+ $('tr.cg-' + idnum).toggle();
	+ if (src.substr(-9) == 'minus.png')
	+ $(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
	+ else
	+ $(this).attr('src', src.substr(0, src.length-8) + 'minus.png');
	+ }).css('display', '');
	+ if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) {
	+ togglers.click();
	+ }
	+ },
	+
	+ /**
	+ * helper function to hide the search marks again
	+ */
	+ hideSearchWords : function() {
	+ $('.sidebar .this-page-menu li.highlight-link').fadeOut(300);
	+ $('span.highlighted').removeClass('highlighted');
	+ },
	+
	+ /**
	+ * make the url absolute
	+ */
	+ makeURL : function(relativeURL) {
	+ return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL;
	+ },
	+
	+ /**
	+ * get the current relative url
	+ */
	+ getCurrentURL : function() {
	+ var path = document.location.pathname;
	+ var parts = path.split(/\//);
	+ $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() {
	+ if (this == '..')
	+ parts.pop();
	+ });
	+ var url = parts.join('/');
	+ return path.substring(url.lastIndexOf('/') + 1, path.length - 1);
	+ }
	+};
	+
	+// quick alias for translations
	+_ = Documentation.gettext;
	+
	+$(document).ready(function() {
	+ Documentation.init();
	+});
	diff --git a/Doc/newdoc/_build/html/_static/file.png b/Doc/newdoc/_build/html/_static/file.png
	new file mode 100644
	index 0000000..d18082e
	Binary files /dev/null and b/Doc/newdoc/_build/html/_static/file.png differ
	diff --git a/Doc/newdoc/_build/html/_static/jquery.js b/Doc/newdoc/_build/html/_static/jquery.js
	new file mode 100644
	index 0000000..7c24308
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/_static/jquery.js
	@@ -0,0 +1,154 @@
	+/*!
	+ * jQuery JavaScript Library v1.4.2
	+ * http://jquery.com/
	+ *
	+ * Copyright 2010, John Resig
	+ * Dual licensed under the MIT or GPL Version 2 licenses.
	+ * http://jquery.org/license
	+ *
	+ * Includes Sizzle.js
	+ * http://sizzlejs.com/
	+ * Copyright 2010, The Dojo Foundation
	+ * Released under the MIT, BSD, and GPL Licenses.
	+ *
	+ * Date: Sat Feb 13 22:33:48 2010 -0500
	+ */
	+(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text\|\|b.textContent\|\|b.innerHTML\|\|"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
	+e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this\|\|!i\|\|!i.live\|\|a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
	+j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"\|\|i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f\|\|f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
	+"&")}function qa(a){return!a\|\|!a.parentNode\|\|a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument\|\|b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone\|\|!ua.test(a[0]))){e=
	+true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView\|\|a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<](<[\w\W]+>)[^>]$\|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
	+Wa=/^(\s\|\u00A0)+\|(\s\|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
	+(d[1]\|\|!b))if(d[1]){f=b?b.ownerDocument\|\|b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
	+a)}else return!b\|\|b.jquery?(b\|\|T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
	+"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
	+function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject\|\|c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]\|\|{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]\|\|{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)\|\|c.isArray(o))){i=i&&(c.isPlainObject(i)\|\|
	+c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
	+L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a\|\|$.call(a)!=="[object Object]"\|\|a.nodeType\|\|a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
	+"isPrototypeOf"))return false;var b;for(b in a);return b===w\|\|aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"\|\|!a)return null;a=c.trim(a);if(/^[\],:{}\s]$/.test(a.replace(/\\(?:["\\\/bfnrt]\|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]"\|true\|false\|null\|-?\d+(?:\.\d)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^\|:\|,)(?:\s\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
	+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]\|\|s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w\|\|c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
	+d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a\|\|"").replace(Wa,"")},makeArray:function(a,b){b=b\|\|[];if(a!=null)a.length==null\|\|typeof a==="string"\|\|c.isFunction(a)\|\|typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
	+a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
	+!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d\|\|this,arguments)};if(a)b.guid=a.guid=a.guid\|\|b.guid\|\|c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)\|\|/(opera)(?:.version)?[ \/]([\w.]+)/.exec(a)\|\|/(msie) ([\w.]+)/.exec(a)\|\|!/compatible/.test(a)&&/(mozilla)(?:.? rv:([\w.]+))?/.exec(a)\|\|[];return{browser:a[1]\|\|"",version:a[2]\|\|"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
	+true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML=" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
	+var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e\|\|!e.length\|\|!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
	+parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
	+false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
	+s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
	+applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f\|\|(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
	+else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
	+a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b\|\|"fx")+"queue";var f=c.data(a,b);if(!d)return f\|\|[];if(!f\|\|c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b\|\|"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
	+w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]\|\|a:a;b=b\|\|"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a\|\|"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href\|src\|style/,ab=/(button\|input)/i,bb=/(button\|input\|object\|select\|textarea)/i,
	+cb=/^(a\|area)$/i,Ba=/radio\|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a\|\|"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
	+i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"\|\|a===w)for(var b=(a\|\|"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
	+" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"\|\|d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
	+this.className\|\|a===false?"":c.data(this,"__className__")\|\|""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value\|\|{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
	+e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value\|\|"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
	+c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a\|\|a.nodeType===3\|\|a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1\|\|!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]\|\|b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
	+a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)\|\|cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\\|`]/g,
	+function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3\|\|a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events\|\|{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
	+k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]\|\|{};if(!u){u=i[k]=[];if(!z.setup\|\|z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3\|\|a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
	+C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b\|\|typeof b==="string"&&b.charAt(0)==="."){b=b\|\|"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^\|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.\|$)")}if(r=C[e])if(d){n=c.event.special[e]\|\|{};for(B=f\|\|0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i\|\|k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
	+null)break}}if(r.length===0\|\|f!=null&&r.length===1){if(!n.teardown\|\|n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i\|\|k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type\|\|a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
	+e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d\|\|d.nodeType===3\|\|d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode\|\|d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
	+f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]\|\|{};if((!k._default\|\|k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a\|\|A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
	+if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^\|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.\|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b\|\|f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
	+fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement\|\|s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft\|\|d&&d.scrollLeft\|\|0)-(b&&b.clientLeft\|\|d&&d.clientLeft\|\|0);a.pageY=a.clientY+(b&&b.scrollTop\|\|
	+d&&d.scrollTop\|\|0)-(b&&b.clientTop\|\|d&&d.clientTop\|\|0)}if(!a.which&&(a.charCode\|\|a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode\|\|a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
	+"events").live\|\|[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
	+a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
	+isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
	+{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"\|\|d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"\|\|d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
	+if(!c.support.changeBubbles){var da=/textarea\|input\|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"\|\|b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)\|\|d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"\|\|d.type!=="radio")c.data(d,"_change_data",
	+e);if(!(f===w\|\|e===f))if(f!=null\|\|e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"\|\|d==="checkbox"\|\|b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"\|\|a.keyCode===32&&(d==="checkbox"\|\|d==="radio")\|\|d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
	+"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
	+d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
	+!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
	+toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)\|\|0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)\|\|false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b\|\|a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j\|\|this.selector,
	+u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d\|\|"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"\|\|i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]\|\|i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
	+function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3\|\|l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
	+if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:$(?:\([^()]+$\|[^()]+)+\)\|\[(?:\[[^[\]]\]\|['"][^'"]['"]\|[^[\]'"]+)+\]\|\\.\|[^ >+~,(\[\\]+)+\|[>+~])(\s,\s)?((?:.\|\r\|\n)*)/g,
	+e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l\|\|[];var q=h=h\|\|s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g\|\|typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
	+t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"\|\|p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y\|\|(y=t);y\|\|k.error(D\|\|
	+g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true\|\|y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
	+for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]\|\|"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m\|\|(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
	+1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l\|\|(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]\|\\.)+)/,
	+CLASS:/\.((?:[\w\u00c0-\uFFFF-]\|\\.)+)/,NAME:/\[name=['"]((?:[\w\u00c0-\uFFFF-]\|\\.)+)['"]\]/,ATTR:/\[\s((?:[\w\u00c0-\uFFFF-]\|\\.)+)\s(?:(\S?=)\s(['"])(.?)\3\|)\s\]/,TAG:/^((?:[\w\u00c0-\uFFFF\-]\|\\.)+)/,CHILD:/:(only\|nth\|last\|first)-child(?:$(even\|odd\|[\dn+-])$)?/,POS:/:(nth\|eq\|gt\|lt\|first\|last\|even\|odd)(?:$(\d)$)?(?=[^-]\|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]\|\\.)+)(?:$(['"]?)((?:\([^$]+\)\|[^])+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
	+relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l\|\|p&&p.nodeName.toLowerCase()===h?p\|\|false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
	+l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
	+h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l\|\|m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
	+CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d)n((?:\+\|-)?\d)/.exec(g[2]==="even"&&"2n"\|\|g[2]==="odd"&&"2n+1"\|\|!/\D/.test(g[2])&&"0n+"+g[2]\|\|g[2]);g[2]=h[1]+(h[2]\|\|1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])\|\|"").length>1\|\|/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l\|\|m.push.apply(m,
	+g);return false}else if(n.match.POS.test(g[0])\|\|n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
	+text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type\|\|g.nodeName.toLowerCase()==="button"},input:function(g){return/input\|select\|textarea\|button/i.test(g.nodeName)}},
	+setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent\|\|g.innerText\|\|a([g])\|\|"").indexOf(h[3])>=0;else if(q==="not"){h=
	+h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h\|\|!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
	+m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1\|\|g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className\|\|g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
	+"="?l===h:m==="="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="\|="?l===h\|\|l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]\])(?![^$]$)/.source);n.leftMatch[u]=new RegExp(/(^(?:.\|\r\|\n)?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
	+h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h\|\|[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition\|\|
	+!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex\|\|!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument\|\|!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
	+h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]\|\|typeof q.getAttributeNode!=="undefined"&&
	+q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]===""){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
	+if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q\|\|s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
	+(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName\|\|g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
	+function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument\|\|g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents\|prevUntil\|prevAll)/,
	+gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
	+c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
	+{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]\|\|(j[i]=c.expr.match.POS.test(i)?c(i,b\|\|this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b\|\|this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a\|\|typeof a===
	+"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b\|\|this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])\|\|qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
	+d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
	+a.contentDocument\|\|a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)\|\|(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1\|\|gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w\|\|a.nodeType!==1\|\|!c(a).is(d));){a.nodeType===
	+1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b\|\|1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+\|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]?)\/>/g,hb=/^(?:area\|br\|col\|embed\|hr\|img\|input\|link\|meta\|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<\|&#?\w+;/,ta=/<script\|<object\|<embed\|<option\|<style/i,ua=/checked\s(?:[^=]\|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
	+a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
	+c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument\|\|s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
	+wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")\|\|c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
	+prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
	+this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a\|\|c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName(""));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName(""));b.firstChild;)b.removeChild(b.firstChild);
	+return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find(""),b.find(""))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
	+""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace\|\|!V.test(a))&&!F[(La.exec(a)\|\|["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
	+this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]\|\|
	+u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
	+1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0\|\|e.cacheable\|\|this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
	+return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b\|\|s;if(typeof b.createElement==="undefined")b=b.ownerDocument\|\|b[0]&&b[0].ownerDocument\|\|s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)\|\|["",
	+""])[1].toLowerCase(),k=F[o]\|\|F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
	+c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type\|\|e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
	+c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index\|font-?weight\|opacity\|zoom\|line-?height/i,Na=/alpha$[^)]$/,Oa=/opacity=([^)])/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
	+function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a\|\|a.nodeType===3\|\|a.nodeType===8)return w;if((b==="width"\|\|b==="height")&&parseFloat(d)<0)d=w;var f=a.style\|\|a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter\|\|c.curCSS(a,"filter")\|\|"";f.filter=
	+Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"\|\|b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f\|\|(e-=parseFloat(c.curCSS(a,"padding"+this,true))\|\|0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))\|\|0;else e-=parseFloat(c.curCSS(a,
	+"border"+this+"Width",true))\|\|0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter\|\|"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
	+a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]\|\|a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f\|\|0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
	+a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.\|\s)?\/script>/gi,ub=/select\|textarea/i,vb=/color\|date\|datetime\|email\|hidden\|month\|number\|password\|range\|search\|tel\|text\|time\|url\|week/i,N=/=\?(&\|$)/,ka=/\?/,wb=/(\?\|&)_=.?(&\|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
	+"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"\|\|o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
	+serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked\|\|ub.test(this.nodeName)\|\|vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
	+function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f\|\|d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f\|\|d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
	+global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"\|\|!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"/"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
	+e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context\|\|e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)\|\|(e.url+=(ka.test(e.url)?
	+"&":"?")+(e.jsonp\|\|"callback")+"=?");else if(!e.data\|\|!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp\|\|"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)\|\|N.test(e.url))){j=e.jsonpCallback\|\|"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]\|\|function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
	+false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol\|\|r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]\|\|s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
	+false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState\|\|this.readyState==="loaded"\|\|this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data\|\|a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
	+c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r\|\|x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", /":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x\|\|x.readyState===0\|\|q==="abort"){E\|\|
	+d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4\|\|q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"\|\|i==="notmodified")j\|\|b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
	+g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"\|\|n==="PUT"\|\|n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async\|\|g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context\|\|a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"\|\|a.status>=200&&a.status<300\|\|a.status===304\|\|a.status===
	+1223\|\|a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304\|\|a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")\|\|"",e=b==="xml"\|\|!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
	+"json"\|\|!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"\|\|!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b\|\|/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"\|\|c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
	+if(c.isArray(a)\|\|a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle\|show\|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a\|\|a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
	+this[a].style.display=d\|\|"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")\|\|"";return this}},hide:function(a,b){if(a\|\|a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
	+"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null\|\|d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
	+animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o\|\|a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"\|\|i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
	+j.specialEasing\|\|{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)\|\|0;if(C){u=parseFloat(C[2]);var E=C[3]\|\|"px";if(E!=="px"){k.style[r]=(u\|\|1)+E;B=(u\|\|1)/z.cur(true)B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
	+this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b\|\|this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d\|\|!d&&b\|\|c.isFunction(a)&&a,duration:a,easing:d&&b\|\|b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
	+"number"?f.duration:c.fx.speeds[f.duration]\|\|c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+fa},swing:function(a,b,d,f){return(-Math.cos(aMath.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]\|\|
	+c.fx.step._default)(this);if((this.prop==="height"\|\|this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style\|\|this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))\|\|0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d\|\|this.unit\|\|"px";this.now=this.start;
	+this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"\|\|this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a\|\|b>=this.options.duration+this.startTime){this.now=
	+this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide\|\|this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
	+e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing\|\|(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]\|\|a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()\|\|a.splice(b--,1);a.length\|\|
	+c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"\|\|a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
	+function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b\|\|!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset\|\|c.support.boxModel&&f.scrollTop\|\|b.scrollTop)-(f.clientTop\|\|b.clientTop\|\|0),left:d.left+(self.pageXOffset\|\|c.support.boxModel&&f.scrollLeft\|\|b.scrollLeft)-(f.clientLeft\|\|b.clientLeft\|\|0)}}:function(a){var b=
	+this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b\|\|!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
	+k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able\|d\|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)\|\|0;n+=parseFloat(j.borderLeftWidth)\|\|0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)\|\|0;n+=parseFloat(j.borderLeftWidth)\|\|0}f=j}if(f.position==="relative"\|\|f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
	+f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))\|\|0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
	+a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20\|\|f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
	+c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))\|\|0;d+=parseFloat(c.curCSS(a,"marginLeft",true))\|\|0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)\|\|0,i=parseInt(c.curCSS(a,"left",true),10)\|\|0;if(c.isFunction(b))b=b.call(a,
	+d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body\|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))\|\|0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))\|\|0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))\|\|0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))\|\|0;return{top:d.top-
	+f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent\|\|s.body;a&&!/^body\|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
	+"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]\|\|j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
	+e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]\|\|e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
	diff --git a/Doc/newdoc/_build/html/_static/minus.png b/Doc/newdoc/_build/html/_static/minus.png
	new file mode 100644
	index 0000000..da1c562
	Binary files /dev/null and b/Doc/newdoc/_build/html/_static/minus.png differ
	diff --git a/Doc/newdoc/_build/html/_static/plus.png b/Doc/newdoc/_build/html/_static/plus.png
	new file mode 100644
	index 0000000..b3cb374
	Binary files /dev/null and b/Doc/newdoc/_build/html/_static/plus.png differ
	diff --git a/Doc/newdoc/_build/html/_static/pygments.css b/Doc/newdoc/_build/html/_static/pygments.css
	new file mode 100644
	index 0000000..1a14f2a
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/_static/pygments.css
	@@ -0,0 +1,62 @@
	+.highlight .hll { background-color: #ffffcc }
	+.highlight { background: #eeffcc; }
	+.highlight .c { color: #408090; font-style: italic } /* Comment */
	+.highlight .err { border: 1px solid #FF0000 } /* Error */
	+.highlight .k { color: #007020; font-weight: bold } /* Keyword */
	+.highlight .o { color: #666666 } /* Operator */
	+.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */
	+.highlight .cp { color: #007020 } /* Comment.Preproc */
	+.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */
	+.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
	+.highlight .gd { color: #A00000 } /* Generic.Deleted */
	+.highlight .ge { font-style: italic } /* Generic.Emph */
	+.highlight .gr { color: #FF0000 } /* Generic.Error */
	+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
	+.highlight .gi { color: #00A000 } /* Generic.Inserted */
	+.highlight .go { color: #303030 } /* Generic.Output */
	+.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
	+.highlight .gs { font-weight: bold } /* Generic.Strong */
	+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
	+.highlight .gt { color: #0040D0 } /* Generic.Traceback */
	+.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
	+.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
	+.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
	+.highlight .kp { color: #007020 } /* Keyword.Pseudo */
	+.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */
	+.highlight .kt { color: #902000 } /* Keyword.Type */
	+.highlight .m { color: #208050 } /* Literal.Number */
	+.highlight .s { color: #4070a0 } /* Literal.String */
	+.highlight .na { color: #4070a0 } /* Name.Attribute */
	+.highlight .nb { color: #007020 } /* Name.Builtin */
	+.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */
	+.highlight .no { color: #60add5 } /* Name.Constant */
	+.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */
	+.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */
	+.highlight .ne { color: #007020 } /* Name.Exception */
	+.highlight .nf { color: #06287e } /* Name.Function */
	+.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */
	+.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
	+.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */
	+.highlight .nv { color: #bb60d5 } /* Name.Variable */
	+.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */
	+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
	+.highlight .mf { color: #208050 } /* Literal.Number.Float */
	+.highlight .mh { color: #208050 } /* Literal.Number.Hex */
	+.highlight .mi { color: #208050 } /* Literal.Number.Integer */
	+.highlight .mo { color: #208050 } /* Literal.Number.Oct */
	+.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */
	+.highlight .sc { color: #4070a0 } /* Literal.String.Char */
	+.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */
	+.highlight .s2 { color: #4070a0 } /* Literal.String.Double */
	+.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */
	+.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */
	+.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */
	+.highlight .sx { color: #c65d09 } /* Literal.String.Other */
	+.highlight .sr { color: #235388 } /* Literal.String.Regex */
	+.highlight .s1 { color: #4070a0 } /* Literal.String.Single */
	+.highlight .ss { color: #517918 } /* Literal.String.Symbol */
	+.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */
	+.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */
	+.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */
	+.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */
	+.highlight .il { color: #208050 } /* Literal.Number.Integer.Long */
	\ No newline at end of file
	diff --git a/Doc/newdoc/_build/html/_static/searchtools.js b/Doc/newdoc/_build/html/_static/searchtools.js
	new file mode 100644
	index 0000000..5cbfe00
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/_static/searchtools.js
	@@ -0,0 +1,518 @@
	+/*
	+ * searchtools.js
	+ * ~~~~~~~~~~~~~~
	+ *
	+ * Sphinx JavaScript utilties for the full-text search.
	+ *
	+ * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
	+ * :license: BSD, see LICENSE for details.
	+ *
	+ */
	+
	+/**
	+ * helper function to return a node containing the
	+ * search summary for a given text. keywords is a list
	+ * of stemmed words, hlwords is the list of normal, unstemmed
	+ * words. the first one is used to find the occurance, the
	+ * latter for highlighting it.
	+ */
	+
	+jQuery.makeSearchSummary = function(text, keywords, hlwords) {
	+ var textLower = text.toLowerCase();
	+ var start = 0;
	+ $.each(keywords, function() {
	+ var i = textLower.indexOf(this.toLowerCase());
	+ if (i > -1)
	+ start = i;
	+ });
	+ start = Math.max(start - 120, 0);
	+ var excerpt = ((start > 0) ? '...' : '') +
	+ $.trim(text.substr(start, 240)) +
	+ ((start + 240 - text.length) ? '...' : '');
	+ var rv = $('<div class="context"></div>').text(excerpt);
	+ $.each(hlwords, function() {
	+ rv = rv.highlightText(this, 'highlighted');
	+ });
	+ return rv;
	+}
	+
	+/**
	+ * Porter Stemmer
	+ */
	+var PorterStemmer = function() {
	+
	+ var step2list = {
	+ ational: 'ate',
	+ tional: 'tion',
	+ enci: 'ence',
	+ anci: 'ance',
	+ izer: 'ize',
	+ bli: 'ble',
	+ alli: 'al',
	+ entli: 'ent',
	+ eli: 'e',
	+ ousli: 'ous',
	+ ization: 'ize',
	+ ation: 'ate',
	+ ator: 'ate',
	+ alism: 'al',
	+ iveness: 'ive',
	+ fulness: 'ful',
	+ ousness: 'ous',
	+ aliti: 'al',
	+ iviti: 'ive',
	+ biliti: 'ble',
	+ logi: 'log'
	+ };
	+
	+ var step3list = {
	+ icate: 'ic',
	+ ative: '',
	+ alize: 'al',
	+ iciti: 'ic',
	+ ical: 'ic',
	+ ful: '',
	+ ness: ''
	+ };
	+
	+ var c = "[^aeiou]"; // consonant
	+ var v = "[aeiouy]"; // vowel
	+ var C = c + "[^aeiouy]*"; // consonant sequence
	+ var V = v + "[aeiou]*"; // vowel sequence
	+
	+ var mgr0 = "^(" + C + ")?" + V + C; // [C]VC... is m>0
	+ var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$"; // [C]VC[V] is m=1
	+ var mgr1 = "^(" + C + ")?" + V + C + V + C; // [C]VCVC... is m>1
	+ var s_v = "^(" + C + ")?" + v; // vowel in stem
	+
	+ this.stemWord = function (w) {
	+ var stem;
	+ var suffix;
	+ var firstch;
	+ var origword = w;
	+
	+ if (w.length < 3)
	+ return w;
	+
	+ var re;
	+ var re2;
	+ var re3;
	+ var re4;
	+
	+ firstch = w.substr(0,1);
	+ if (firstch == "y")
	+ w = firstch.toUpperCase() + w.substr(1);
	+
	+ // Step 1a
	+ re = /^(.+?)(ss\|i)es$/;
	+ re2 = /^(.+?)([^s])s$/;
	+
	+ if (re.test(w))
	+ w = w.replace(re,"$1$2");
	+ else if (re2.test(w))
	+ w = w.replace(re2,"$1$2");
	+
	+ // Step 1b
	+ re = /^(.+?)eed$/;
	+ re2 = /^(.+?)(ed\|ing)$/;
	+ if (re.test(w)) {
	+ var fp = re.exec(w);
	+ re = new RegExp(mgr0);
	+ if (re.test(fp[1])) {
	+ re = /.$/;
	+ w = w.replace(re,"");
	+ }
	+ }
	+ else if (re2.test(w)) {
	+ var fp = re2.exec(w);
	+ stem = fp[1];
	+ re2 = new RegExp(s_v);
	+ if (re2.test(stem)) {
	+ w = stem;
	+ re2 = /(at\|bl\|iz)$/;
	+ re3 = new RegExp("([^aeiouylsz])\\1$");
	+ re4 = new RegExp("^" + C + v + "[^aeiouwxy]$");
	+ if (re2.test(w))
	+ w = w + "e";
	+ else if (re3.test(w)) {
	+ re = /.$/;
	+ w = w.replace(re,"");
	+ }
	+ else if (re4.test(w))
	+ w = w + "e";
	+ }
	+ }
	+
	+ // Step 1c
	+ re = /^(.+?)y$/;
	+ if (re.test(w)) {
	+ var fp = re.exec(w);
	+ stem = fp[1];
	+ re = new RegExp(s_v);
	+ if (re.test(stem))
	+ w = stem + "i";
	+ }
	+
	+ // Step 2
	+ re = /^(.+?)(ational\|tional\|enci\|anci\|izer\|bli\|alli\|entli\|eli\|ousli\|ization\|ation\|ator\|alism\|iveness\|fulness\|ousness\|aliti\|iviti\|biliti\|logi)$/;
	+ if (re.test(w)) {
	+ var fp = re.exec(w);
	+ stem = fp[1];
	+ suffix = fp[2];
	+ re = new RegExp(mgr0);
	+ if (re.test(stem))
	+ w = stem + step2list[suffix];
	+ }
	+
	+ // Step 3
	+ re = /^(.+?)(icate\|ative\|alize\|iciti\|ical\|ful\|ness)$/;
	+ if (re.test(w)) {
	+ var fp = re.exec(w);
	+ stem = fp[1];
	+ suffix = fp[2];
	+ re = new RegExp(mgr0);
	+ if (re.test(stem))
	+ w = stem + step3list[suffix];
	+ }
	+
	+ // Step 4
	+ re = /^(.+?)(al\|ance\|ence\|er\|ic\|able\|ible\|ant\|ement\|ment\|ent\|ou\|ism\|ate\|iti\|ous\|ive\|ize)$/;
	+ re2 = /^(.+?)(s\|t)(ion)$/;
	+ if (re.test(w)) {
	+ var fp = re.exec(w);
	+ stem = fp[1];
	+ re = new RegExp(mgr1);
	+ if (re.test(stem))
	+ w = stem;
	+ }
	+ else if (re2.test(w)) {
	+ var fp = re2.exec(w);
	+ stem = fp[1] + fp[2];
	+ re2 = new RegExp(mgr1);
	+ if (re2.test(stem))
	+ w = stem;
	+ }
	+
	+ // Step 5
	+ re = /^(.+?)e$/;
	+ if (re.test(w)) {
	+ var fp = re.exec(w);
	+ stem = fp[1];
	+ re = new RegExp(mgr1);
	+ re2 = new RegExp(meq1);
	+ re3 = new RegExp("^" + C + v + "[^aeiouwxy]$");
	+ if (re.test(stem) \|\| (re2.test(stem) && !(re3.test(stem))))
	+ w = stem;
	+ }
	+ re = /ll$/;
	+ re2 = new RegExp(mgr1);
	+ if (re.test(w) && re2.test(w)) {
	+ re = /.$/;
	+ w = w.replace(re,"");
	+ }
	+
	+ // and turn initial Y back to y
	+ if (firstch == "y")
	+ w = firstch.toLowerCase() + w.substr(1);
	+ return w;
	+ }
	+}
	+
	+
	+/**
	+ * Search Module
	+ */
	+var Search = {
	+
	+ _index : null,
	+ _queued_query : null,
	+ _pulse_status : -1,
	+
	+ init : function() {
	+ var params = $.getQueryParameters();
	+ if (params.q) {
	+ var query = params.q[0];
	+ $('input[name="q"]')[0].value = query;
	+ this.performSearch(query);
	+ }
	+ },
	+
	+ loadIndex : function(url) {
	+ $.ajax({type: "GET", url: url, data: null, success: null,
	+ dataType: "script", cache: true});
	+ },
	+
	+ setIndex : function(index) {
	+ var q;
	+ this._index = index;
	+ if ((q = this._queued_query) !== null) {
	+ this._queued_query = null;
	+ Search.query(q);
	+ }
	+ },
	+
	+ hasIndex : function() {
	+ return this._index !== null;
	+ },
	+
	+ deferQuery : function(query) {
	+ this._queued_query = query;
	+ },
	+
	+ stopPulse : function() {
	+ this._pulse_status = 0;
	+ },
	+
	+ startPulse : function() {
	+ if (this._pulse_status >= 0)
	+ return;
	+ function pulse() {
	+ Search._pulse_status = (Search._pulse_status + 1) % 4;
	+ var dotString = '';
	+ for (var i = 0; i < Search._pulse_status; i++)
	+ dotString += '.';
	+ Search.dots.text(dotString);
	+ if (Search._pulse_status > -1)
	+ window.setTimeout(pulse, 500);
	+ };
	+ pulse();
	+ },
	+
	+ /**
	+ * perform a search for something
	+ */
	+ performSearch : function(query) {
	+ // create the required interface elements
	+ this.out = $('#search-results');
	+ this.title = $('<h2>' + _('Searching') + '</h2>').appendTo(this.out);
	+ this.dots = $('<span></span>').appendTo(this.title);
	+ this.status = $('<p style="display: none"></p>').appendTo(this.out);
	+ this.output = $('<ul class="search"/>').appendTo(this.out);
	+
	+ $('#search-progress').text(_('Preparing search...'));
	+ this.startPulse();
	+
	+ // index already loaded, the browser was quick!
	+ if (this.hasIndex())
	+ this.query(query);
	+ else
	+ this.deferQuery(query);
	+ },
	+
	+ query : function(query) {
	+ var stopwords = ['and', 'then', 'into', 'it', 'as', 'are', 'in',
	+ 'if', 'for', 'no', 'there', 'their', 'was', 'is',
	+ 'be', 'to', 'that', 'but', 'they', 'not', 'such',
	+ 'with', 'by', 'a', 'on', 'these', 'of', 'will',
	+ 'this', 'near', 'the', 'or', 'at'];
	+
	+ // stem the searchterms and add them to the correct list
	+ var stemmer = new PorterStemmer();
	+ var searchterms = [];
	+ var excluded = [];
	+ var hlterms = [];
	+ var tmp = query.split(/\s+/);
	+ var object = (tmp.length == 1) ? tmp[0].toLowerCase() : null;
	+ for (var i = 0; i < tmp.length; i++) {
	+ if ($u.indexOf(stopwords, tmp[i]) != -1 \|\| tmp[i].match(/^\d+$/) \|\|
	+ tmp[i] == "") {
	+ // skip this "word"
	+ continue;
	+ }
	+ // stem the word
	+ var word = stemmer.stemWord(tmp[i]).toLowerCase();
	+ // select the correct list
	+ if (word[0] == '-') {
	+ var toAppend = excluded;
	+ word = word.substr(1);
	+ }
	+ else {
	+ var toAppend = searchterms;
	+ hlterms.push(tmp[i].toLowerCase());
	+ }
	+ // only add if not already in the list
	+ if (!$.contains(toAppend, word))
	+ toAppend.push(word);
	+ };
	+ var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
	+
	+ // console.debug('SEARCH: searching for:');
	+ // console.info('required: ', searchterms);
	+ // console.info('excluded: ', excluded);
	+
	+ // prepare search
	+ var filenames = this._index.filenames;
	+ var titles = this._index.titles;
	+ var terms = this._index.terms;
	+ var objects = this._index.objects;
	+ var objtypes = this._index.objtypes;
	+ var objnames = this._index.objnames;
	+ var fileMap = {};
	+ var files = null;
	+ // different result priorities
	+ var importantResults = [];
	+ var objectResults = [];
	+ var regularResults = [];
	+ var unimportantResults = [];
	+ $('#search-progress').empty();
	+
	+ // lookup as object
	+ if (object != null) {
	+ for (var prefix in objects) {
	+ for (var name in objects[prefix]) {
	+ var fullname = (prefix ? prefix + '.' : '') + name;
	+ if (fullname.toLowerCase().indexOf(object) > -1) {
	+ match = objects[prefix][name];
	+ descr = objnames[match[1]] + _(', in ') + titles[match[0]];
	+ // XXX the generated anchors are not generally correct
	+ // XXX there may be custom prefixes
	+ result = [filenames[match[0]], fullname, '#'+fullname, descr];
	+ switch (match[2]) {
	+ case 1: objectResults.push(result); break;
	+ case 0: importantResults.push(result); break;
	+ case 2: unimportantResults.push(result); break;
	+ }
	+ }
	+ }
	+ }
	+ }
	+
	+ // sort results descending
	+ objectResults.sort(function(a, b) {
	+ return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
	+ });
	+
	+ importantResults.sort(function(a, b) {
	+ return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
	+ });
	+
	+ unimportantResults.sort(function(a, b) {
	+ return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
	+ });
	+
	+
	+ // perform the search on the required terms
	+ for (var i = 0; i < searchterms.length; i++) {
	+ var word = searchterms[i];
	+ // no match but word was a required one
	+ if ((files = terms[word]) == null)
	+ break;
	+ if (files.length == undefined) {
	+ files = [files];
	+ }
	+ // create the mapping
	+ for (var j = 0; j < files.length; j++) {
	+ var file = files[j];
	+ if (file in fileMap)
	+ fileMap[file].push(word);
	+ else
	+ fileMap[file] = [word];
	+ }
	+ }
	+
	+ // now check if the files don't contain excluded terms
	+ for (var file in fileMap) {
	+ var valid = true;
	+
	+ // check if all requirements are matched
	+ if (fileMap[file].length != searchterms.length)
	+ continue;
	+
	+ // ensure that none of the excluded terms is in the
	+ // search result.
	+ for (var i = 0; i < excluded.length; i++) {
	+ if (terms[excluded[i]] == file \|\|
	+ $.contains(terms[excluded[i]] \|\| [], file)) {
	+ valid = false;
	+ break;
	+ }
	+ }
	+
	+ // if we have still a valid result we can add it
	+ // to the result list
	+ if (valid)
	+ regularResults.push([filenames[file], titles[file], '', null]);
	+ }
	+
	+ // delete unused variables in order to not waste
	+ // memory until list is retrieved completely
	+ delete filenames, titles, terms;
	+
	+ // now sort the regular results descending by title
	+ regularResults.sort(function(a, b) {
	+ var left = a[1].toLowerCase();
	+ var right = b[1].toLowerCase();
	+ return (left > right) ? -1 : ((left < right) ? 1 : 0);
	+ });
	+
	+ // combine all results
	+ var results = unimportantResults.concat(regularResults)
	+ .concat(objectResults).concat(importantResults);
	+
	+ // print the results
	+ var resultCount = results.length;
	+ function displayNextItem() {
	+ // results left, load the summary and display it
	+ if (results.length) {
	+ var item = results.pop();
	+ var listItem = $('<li style="display:none"></li>');
	+ if (DOCUMENTATION_OPTIONS.FILE_SUFFIX == '') {
	+ // dirhtml builder
	+ var dirname = item[0] + '/';
	+ if (dirname.match(/\/index\/$/)) {
	+ dirname = dirname.substring(0, dirname.length-6);
	+ } else if (dirname == 'index/') {
	+ dirname = '';
	+ }
	+ listItem.append($('<a/>').attr('href',
	+ DOCUMENTATION_OPTIONS.URL_ROOT + dirname +
	+ highlightstring + item[2]).html(item[1]));
	+ } else {
	+ // normal html builders
	+ listItem.append($('<a/>').attr('href',
	+ item[0] + DOCUMENTATION_OPTIONS.FILE_SUFFIX +
	+ highlightstring + item[2]).html(item[1]));
	+ }
	+ if (item[3]) {
	+ listItem.append($('<span> (' + item[3] + ')</span>'));
	+ Search.output.append(listItem);
	+ listItem.slideDown(5, function() {
	+ displayNextItem();
	+ });
	+ } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
	+ $.get(DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' +
	+ item[0] + '.txt', function(data) {
	+ if (data != '') {
	+ listItem.append($.makeSearchSummary(data, searchterms, hlterms));
	+ Search.output.append(listItem);
	+ }
	+ listItem.slideDown(5, function() {
	+ displayNextItem();
	+ });
	+ });
	+ } else {
	+ // no source available, just display title
	+ Search.output.append(listItem);
	+ listItem.slideDown(5, function() {
	+ displayNextItem();
	+ });
	+ }
	+ }
	+ // search finished, update title and status message
	+ else {
	+ Search.stopPulse();
	+ Search.title.text(_('Search Results'));
	+ if (!resultCount)
	+ Search.status.text(_('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.'));
	+ else
	+ Search.status.text(_('Search finished, found %s page(s) matching the search query.').replace('%s', resultCount));
	+ Search.status.fadeIn(500);
	+ }
	+ }
	+ displayNextItem();
	+ }
	+}
	+
	+$(document).ready(function() {
	+ Search.init();
	+});
	diff --git a/Doc/newdoc/_build/html/_static/sidebar.js b/Doc/newdoc/_build/html/_static/sidebar.js
	new file mode 100644
	index 0000000..7318517
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/_static/sidebar.js
	@@ -0,0 +1,148 @@
	+/*
	+ * sidebar.js
	+ * ~~~~~~~~~~
	+ *
	+ * This script makes the Sphinx sidebar collapsible.
	+ *
	+ * .sphinxsidebar contains .sphinxsidebarwrapper. This script adds
	+ * in .sphixsidebar, after .sphinxsidebarwrapper, the #sidebarbutton
	+ * used to collapse and expand the sidebar.
	+ *
	+ * When the sidebar is collapsed the .sphinxsidebarwrapper is hidden
	+ * and the width of the sidebar and the margin-left of the document
	+ * are decreased. When the sidebar is expanded the opposite happens.
	+ * This script saves a per-browser/per-session cookie used to
	+ * remember the position of the sidebar among the pages.
	+ * Once the browser is closed the cookie is deleted and the position
	+ * reset to the default (expanded).
	+ *
	+ * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
	+ * :license: BSD, see LICENSE for details.
	+ *
	+ */
	+
	+$(function() {
	+ // global elements used by the functions.
	+ // the 'sidebarbutton' element is defined as global after its
	+ // creation, in the add_sidebar_button function
	+ var bodywrapper = $('.bodywrapper');
	+ var sidebar = $('.sphinxsidebar');
	+ var sidebarwrapper = $('.sphinxsidebarwrapper');
	+
	+ // original margin-left of the bodywrapper and width of the sidebar
	+ // with the sidebar expanded
	+ var bw_margin_expanded = bodywrapper.css('margin-left');
	+ var ssb_width_expanded = sidebar.width();
	+
	+ // margin-left of the bodywrapper and width of the sidebar
	+ // with the sidebar collapsed
	+ var bw_margin_collapsed = '.8em';
	+ var ssb_width_collapsed = '.8em';
	+
	+ // colors used by the current theme
	+ var dark_color = $('.related').css('background-color');
	+ var light_color = $('.document').css('background-color');
	+
	+ function sidebar_is_collapsed() {
	+ return sidebarwrapper.is(':not(:visible)');
	+ }
	+
	+ function toggle_sidebar() {
	+ if (sidebar_is_collapsed())
	+ expand_sidebar();
	+ else
	+ collapse_sidebar();
	+ }
	+
	+ function collapse_sidebar() {
	+ sidebarwrapper.hide();
	+ sidebar.css('width', ssb_width_collapsed);
	+ bodywrapper.css('margin-left', bw_margin_collapsed);
	+ sidebarbutton.css({
	+ 'margin-left': '0',
	+ 'height': bodywrapper.height()
	+ });
	+ sidebarbutton.find('span').text('Â»');
	+ sidebarbutton.attr('title', _('Expand sidebar'));
	+ document.cookie = 'sidebar=collapsed';
	+ }
	+
	+ function expand_sidebar() {
	+ bodywrapper.css('margin-left', bw_margin_expanded);
	+ sidebar.css('width', ssb_width_expanded);
	+ sidebarwrapper.show();
	+ sidebarbutton.css({
	+ 'margin-left': ssb_width_expanded-12,
	+ 'height': bodywrapper.height()
	+ });
	+ sidebarbutton.find('span').text('Â«');
	+ sidebarbutton.attr('title', _('Collapse sidebar'));
	+ document.cookie = 'sidebar=expanded';
	+ }
	+
	+ function add_sidebar_button() {
	+ sidebarwrapper.css({
	+ 'float': 'left',
	+ 'margin-right': '0',
	+ 'width': ssb_width_expanded - 28
	+ });
	+ // create the button
	+ sidebar.append(
	+ '<div id="sidebarbutton"><span>«</span></div>'
	+ );
	+ var sidebarbutton = $('#sidebarbutton');
	+ light_color = sidebarbutton.css('background-color');
	+ // find the height of the viewport to center the '<<' in the page
	+ var viewport_height;
	+ if (window.innerHeight)
	+ viewport_height = window.innerHeight;
	+ else
	+ viewport_height = $(window).height();
	+ sidebarbutton.find('span').css({
	+ 'display': 'block',
	+ 'margin-top': (viewport_height - sidebar.position().top - 20) / 2
	+ });
	+
	+ sidebarbutton.click(toggle_sidebar);
	+ sidebarbutton.attr('title', _('Collapse sidebar'));
	+ sidebarbutton.css({
	+ 'color': '#FFFFFF',
	+ 'border-left': '1px solid ' + dark_color,
	+ 'font-size': '1.2em',
	+ 'cursor': 'pointer',
	+ 'height': bodywrapper.height(),
	+ 'padding-top': '1px',
	+ 'margin-left': ssb_width_expanded - 12
	+ });
	+
	+ sidebarbutton.hover(
	+ function () {
	+ $(this).css('background-color', dark_color);
	+ },
	+ function () {
	+ $(this).css('background-color', light_color);
	+ }
	+ );
	+ }
	+
	+ function set_position_from_cookie() {
	+ if (!document.cookie)
	+ return;
	+ var items = document.cookie.split(';');
	+ for(var k=0; k<items.length; k++) {
	+ var key_val = items[k].split('=');
	+ var key = key_val[0];
	+ if (key == 'sidebar') {
	+ var value = key_val[1];
	+ if ((value == 'collapsed') && (!sidebar_is_collapsed()))
	+ collapse_sidebar();
	+ else if ((value == 'expanded') && (sidebar_is_collapsed()))
	+ expand_sidebar();
	+ }
	+ }
	+ }
	+
	+ add_sidebar_button();
	+ var sidebarbutton = $('#sidebarbutton');
	+ set_position_from_cookie();
	+});
	diff --git a/Doc/newdoc/_build/html/_static/underscore.js b/Doc/newdoc/_build/html/_static/underscore.js
	new file mode 100644
	index 0000000..9146e08
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/_static/underscore.js
	@@ -0,0 +1,16 @@
	+(function(){var j=this,n=j._,i=function(a){this._wrapped=a},m=typeof StopIteration!=="undefined"?StopIteration:"__break__",b=j._=function(a){return new i(a)};if(typeof exports!=="undefined")exports._=b;var k=Array.prototype.slice,o=Array.prototype.unshift,p=Object.prototype.toString,q=Object.prototype.hasOwnProperty,r=Object.prototype.propertyIsEnumerable;b.VERSION="0.5.5";b.each=function(a,c,d){try{if(a.forEach)a.forEach(c,d);else if(b.isArray(a)\|\|b.isArguments(a))for(var e=0,f=a.length;e<f;e++)c.call(d,
	+a[e],e,a);else{var g=b.keys(a);f=g.length;for(e=0;e<f;e++)c.call(d,a[g[e]],g[e],a)}}catch(h){if(h!=m)throw h;}return a};b.map=function(a,c,d){if(a&&b.isFunction(a.map))return a.map(c,d);var e=[];b.each(a,function(f,g,h){e.push(c.call(d,f,g,h))});return e};b.reduce=function(a,c,d,e){if(a&&b.isFunction(a.reduce))return a.reduce(b.bind(d,e),c);b.each(a,function(f,g,h){c=d.call(e,c,f,g,h)});return c};b.reduceRight=function(a,c,d,e){if(a&&b.isFunction(a.reduceRight))return a.reduceRight(b.bind(d,e),c);
	+var f=b.clone(b.toArray(a)).reverse();b.each(f,function(g,h){c=d.call(e,c,g,h,a)});return c};b.detect=function(a,c,d){var e;b.each(a,function(f,g,h){if(c.call(d,f,g,h)){e=f;b.breakLoop()}});return e};b.select=function(a,c,d){if(a&&b.isFunction(a.filter))return a.filter(c,d);var e=[];b.each(a,function(f,g,h){c.call(d,f,g,h)&&e.push(f)});return e};b.reject=function(a,c,d){var e=[];b.each(a,function(f,g,h){!c.call(d,f,g,h)&&e.push(f)});return e};b.all=function(a,c,d){c=c\|\|b.identity;if(a&&b.isFunction(a.every))return a.every(c,
	+d);var e=true;b.each(a,function(f,g,h){(e=e&&c.call(d,f,g,h))\|\|b.breakLoop()});return e};b.any=function(a,c,d){c=c\|\|b.identity;if(a&&b.isFunction(a.some))return a.some(c,d);var e=false;b.each(a,function(f,g,h){if(e=c.call(d,f,g,h))b.breakLoop()});return e};b.include=function(a,c){if(b.isArray(a))return b.indexOf(a,c)!=-1;var d=false;b.each(a,function(e){if(d=e===c)b.breakLoop()});return d};b.invoke=function(a,c){var d=b.rest(arguments,2);return b.map(a,function(e){return(c?e[c]:e).apply(e,d)})};b.pluck=
	+function(a,c){return b.map(a,function(d){return d[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);var e={computed:-Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g>=e.computed&&(e={value:f,computed:g})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g<e.computed&&(e={value:f,computed:g})});return e.value};b.sortBy=function(a,c,d){return b.pluck(b.map(a,
	+function(e,f,g){return{value:e,criteria:c.call(d,e,f,g)}}).sort(function(e,f){e=e.criteria;f=f.criteria;return e<f?-1:e>f?1:0}),"value")};b.sortedIndex=function(a,c,d){d=d\|\|b.identity;for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?(e=g+1):(f=g)}return e};b.toArray=function(a){if(!a)return[];if(a.toArray)return a.toArray();if(b.isArray(a))return a;if(b.isArguments(a))return k.call(a);return b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=function(a,c,d){return c&&!d?k.call(a,
	+0,c):a[0]};b.rest=function(a,c,d){return k.call(a,b.isUndefined(c)\|\|d?1:c)};b.last=function(a){return a[a.length-1]};b.compact=function(a){return b.select(a,function(c){return!!c})};b.flatten=function(a){return b.reduce(a,[],function(c,d){if(b.isArray(d))return c.concat(b.flatten(d));c.push(d);return c})};b.without=function(a){var c=b.rest(arguments);return b.select(a,function(d){return!b.include(c,d)})};b.uniq=function(a,c){return b.reduce(a,[],function(d,e,f){if(0==f\|\|(c===true?b.last(d)!=e:!b.include(d,
	+e)))d.push(e);return d})};b.intersect=function(a){var c=b.rest(arguments);return b.select(b.uniq(a),function(d){return b.all(c,function(e){return b.indexOf(e,d)>=0})})};b.zip=function(){for(var a=b.toArray(arguments),c=b.max(b.pluck(a,"length")),d=new Array(c),e=0;e<c;e++)d[e]=b.pluck(a,String(e));return d};b.indexOf=function(a,c){if(a.indexOf)return a.indexOf(c);for(var d=0,e=a.length;d<e;d++)if(a[d]===c)return d;return-1};b.lastIndexOf=function(a,c){if(a.lastIndexOf)return a.lastIndexOf(c);for(var d=
	+a.length;d--;)if(a[d]===c)return d;return-1};b.range=function(a,c,d){var e=b.toArray(arguments),f=e.length<=1;a=f?0:e[0];c=f?e[0]:e[1];d=e[2]\|\|1;e=Math.ceil((c-a)/d);if(e<=0)return[];e=new Array(e);f=a;for(var g=0;1;f+=d){if((d>0?f-c:c-f)>=0)return e;e[g++]=f}};b.bind=function(a,c){var d=b.rest(arguments,2);return function(){return a.apply(c\|\|j,d.concat(b.toArray(arguments)))}};b.bindAll=function(a){var c=b.rest(arguments);if(c.length==0)c=b.functions(a);b.each(c,function(d){a[d]=b.bind(a[d],a)});
	+return a};b.delay=function(a,c){var d=b.rest(arguments,2);return setTimeout(function(){return a.apply(a,d)},c)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(b.rest(arguments)))};b.wrap=function(a,c){return function(){var d=[a].concat(b.toArray(arguments));return c.apply(c,d)}};b.compose=function(){var a=b.toArray(arguments);return function(){for(var c=b.toArray(arguments),d=a.length-1;d>=0;d--)c=[a[d].apply(this,c)];return c[0]}};b.keys=function(a){if(b.isArray(a))return b.range(0,a.length);
	+var c=[];for(var d in a)q.call(a,d)&&c.push(d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=function(a){return b.select(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a,c){for(var d in c)a[d]=c[d];return a};b.clone=function(a){if(b.isArray(a))return a.slice(0);return b.extend({},a)};b.tap=function(a,c){c(a);return a};b.isEqual=function(a,c){if(a===c)return true;var d=typeof a;if(d!=typeof c)return false;if(a==c)return true;if(!a&&c\|\|a&&!c)return false;
	+if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return true;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return false;if(a.length&&a.length!==c.length)return false;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return false;for(var f in a)if(!b.isEqual(a[f],c[f]))return false;return true};b.isEmpty=function(a){return b.keys(a).length==
	+0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=function(a){return!!(a&&a.concat&&a.unshift)};b.isArguments=function(a){return a&&b.isNumber(a.length)&&!b.isArray(a)&&!r.call(a,"length")};b.isFunction=function(a){return!!(a&&a.constructor&&a.call&&a.apply)};b.isString=function(a){return!!(a===""\|\|a&&a.charCodeAt&&a.substr)};b.isNumber=function(a){return p.call(a)==="[object Number]"};b.isDate=function(a){return!!(a&&a.getTimezoneOffset&&a.setUTCFullYear)};b.isRegExp=function(a){return!!(a&&
	+a.test&&a.exec&&(a.ignoreCase\|\|a.ignoreCase===false))};b.isNaN=function(a){return b.isNumber(a)&&isNaN(a)};b.isNull=function(a){return a===null};b.isUndefined=function(a){return typeof a=="undefined"};b.noConflict=function(){j._=n;return this};b.identity=function(a){return a};b.breakLoop=function(){throw m;};var s=0;b.uniqueId=function(a){var c=s++;return a?a+c:c};b.template=function(a,c){a=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+a.replace(/[\r\t\n]/g,
	+" ").replace(/'(?=[^%]*%>)/g,"\t").split("'").join("\\'").split("\t").join("'").replace(/<%=(.+?)%>/g,"',$1,'").split("<%").join("');").split("%>").join("p.push('")+"');}return p.join('');");return c?a(c):a};b.forEach=b.each;b.foldl=b.inject=b.reduce;b.foldr=b.reduceRight;b.filter=b.select;b.every=b.all;b.some=b.any;b.head=b.first;b.tail=b.rest;b.methods=b.functions;var l=function(a,c){return c?b(a).chain():a};b.each(b.functions(b),function(a){var c=b[a];i.prototype[a]=function(){var d=b.toArray(arguments);
	+o.call(d,this._wrapped);return l(c.apply(b,d),this._chain)}});b.each(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){c.apply(this._wrapped,arguments);return l(this._wrapped,this._chain)}});b.each(["concat","join","slice"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){return l(c.apply(this._wrapped,arguments),this._chain)}});i.prototype.chain=function(){this._chain=true;return this};i.prototype.value=function(){return this._wrapped}})();
	diff --git a/Doc/newdoc/_build/html/genindex.html b/Doc/newdoc/_build/html/genindex.html
	new file mode 100644
	index 0000000..c8a78db
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/genindex.html
	@@ -0,0 +1,118 @@
	+
	+
	+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
	+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	+
	+<html xmlns="http://www.w3.org/1999/xhtml">
	+ <head>
	+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	+
	+ <title>Index — pNbody v4 documentation</title>
	+ <link rel="stylesheet" href="_static/default.css" type="text/css" />
	+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
	+ <script type="text/javascript">
	+ var DOCUMENTATION_OPTIONS = {
	+ URL_ROOT: '',
	+ VERSION: '4',
	+ COLLAPSE_INDEX: false,
	+ FILE_SUFFIX: '.html',
	+ HAS_SOURCE: true
	+ };
	+ </script>
	+ <script type="text/javascript" src="_static/jquery.js"></script>
	+ <script type="text/javascript" src="_static/underscore.js"></script>
	+ <script type="text/javascript" src="_static/doctools.js"></script>
	+ <link rel="top" title="pNbody v4 documentation" href="index.html" />
	+ </head>
	+ <body>
	+ <div class="related">
	+ <h3>Navigation</h3>
	+ <ul>
	+ <li class="right" style="margin-right: 10px">
	+ <a href="#" title="General Index"
	+ accesskey="I">index</a></li>
	+ <li><a href="index.html">pNbody v4 documentation</a> »</li>
	+ </ul>
	+ </div>
	+
	+ <div class="document">
	+ <div class="documentwrapper">
	+ <div class="bodywrapper">
	+ <div class="body">
	+
	+
	+ <h1 id="index">Index</h1>
	+
	+ <div class="genindex-jumpbox">
	+ <a href="#C"><strong>C</strong></a> \| <a href="#E"><strong>E</strong></a> \| <a href="#T"><strong>T</strong></a> \| <a href="#W"><strong>W</strong></a>
	+ </div>
	+<h2 id="C">C</h2>
	+<table width="100%" class="indextable genindextable"><tr>
	+ <td width="33%" valign="top"><dl>
	+ <dt><a href="rst/Io.html#pNbody.io.checkfile">checkfile() (in module pNbody.io)</a></dt>
	+</dl></td>
	+</tr></table>
	+
	+<h2 id="E">E</h2>
	+<table width="100%" class="indextable genindextable"><tr>
	+ <td width="33%" valign="top"><dl>
	+ <dt><a href="rst/Io.html#pNbody.io.end_of_file">end_of_file() (in module pNbody.io)</a></dt>
	+</dl></td>
	+</tr></table>
	+
	+<h2 id="T">T</h2>
	+<table width="100%" class="indextable genindextable"><tr>
	+ <td width="33%" valign="top"><dl>
	+ <dt><a href="rst/Io.html#pNbody.io.testfct">testfct() (in module pNbody.io)</a></dt>
	+</dl></td>
	+</tr></table>
	+
	+<h2 id="W">W</h2>
	+<table width="100%" class="indextable genindextable"><tr>
	+ <td width="33%" valign="top"><dl>
	+ <dt><a href="rst/Io.html#pNbody.io.write_array">write_array() (in module pNbody.io)</a></dt>
	+</dl></td>
	+</tr></table>
	+
	+
	+
	+ </div>
	+ </div>
	+ </div>
	+ <div class="sphinxsidebar">
	+ <div class="sphinxsidebarwrapper">
	+
	+
	+
	+<div id="searchbox" style="display: none">
	+ <h3>Quick search</h3>
	+ <form class="search" action="search.html" method="get">
	+ <input type="text" name="q" size="18" />
	+ <input type="submit" value="Go" />
	+ <input type="hidden" name="check_keywords" value="yes" />
	+ <input type="hidden" name="area" value="default" />
	+ </form>
	+ <p class="searchtip" style="font-size: 90%">
	+ Enter search terms or a module, class or function name.
	+ </p>
	+</div>
	+<script type="text/javascript">$('#searchbox').show(0);</script>
	+ </div>
	+ </div>
	+ <div class="clearer"></div>
	+ </div>
	+ <div class="related">
	+ <h3>Navigation</h3>
	+ <ul>
	+ <li class="right" style="margin-right: 10px">
	+ <a href="#" title="General Index"
	+ >index</a></li>
	+ <li><a href="index.html">pNbody v4 documentation</a> »</li>
	+ </ul>
	+ </div>
	+ <div class="footer">
	+ © Copyright 2011, Yves Revaz.
	+ Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.4.
	+ </div>
	+ </body>
	+</html>
	\ No newline at end of file
	diff --git a/Doc/newdoc/_build/html/index.html b/Doc/newdoc/_build/html/index.html
	new file mode 100644
	index 0000000..7584d13
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/index.html
	@@ -0,0 +1,122 @@
	+
	+
	+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
	+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	+
	+<html xmlns="http://www.w3.org/1999/xhtml">
	+ <head>
	+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	+
	+ <title>Welcome to pNbodyâs documentation! — pNbody v4 documentation</title>
	+ <link rel="stylesheet" href="_static/default.css" type="text/css" />
	+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
	+ <script type="text/javascript">
	+ var DOCUMENTATION_OPTIONS = {
	+ URL_ROOT: '',
	+ VERSION: '4',
	+ COLLAPSE_INDEX: false,
	+ FILE_SUFFIX: '.html',
	+ HAS_SOURCE: true
	+ };
	+ </script>
	+ <script type="text/javascript" src="_static/jquery.js"></script>
	+ <script type="text/javascript" src="_static/underscore.js"></script>
	+ <script type="text/javascript" src="_static/doctools.js"></script>
	+ <link rel="top" title="pNbody v4 documentation" href="#" />
	+ <link rel="next" title="Overview" href="rst/Overview.html" />
	+ </head>
	+ <body>
	+ <div class="related">
	+ <h3>Navigation</h3>
	+ <ul>
	+ <li class="right" style="margin-right: 10px">
	+ <a href="genindex.html" title="General Index"
	+ accesskey="I">index</a></li>
	+ <li class="right" >
	+ <a href="rst/Overview.html" title="Overview"
	+ accesskey="N">next</a> \|</li>
	+ <li><a href="#">pNbody v4 documentation</a> »</li>
	+ </ul>
	+ </div>
	+
	+ <div class="document">
	+ <div class="documentwrapper">
	+ <div class="bodywrapper">
	+ <div class="body">
	+
	+ <div class="section" id="welcome-to-pnbody-s-documentation">
	+<h1>Welcome to pNbody’s documentation!<a class="headerlink" href="#welcome-to-pnbody-s-documentation" title="Permalink to this headline">Â¶</a></h1>
	+<p>Contents:</p>
	+<div class="toctree-wrapper compound">
	+<ul>
	+<li class="toctree-l1"><a class="reference internal" href="rst/Overview.html">Overview</a></li>
	+<li class="toctree-l1"><a class="reference internal" href="rst/Io.html">the Io module</a></li>
	+</ul>
	+</div>
	+</div>
	+<div class="section" id="indices-and-tables">
	+<h1>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline">Â¶</a></h1>
	+<ul class="simple">
	+<li><a class="reference internal" href="genindex.html"><em>Index</em></a></li>
	+<li><a class="reference internal" href="py-modindex.html"><em>Module Index</em></a></li>
	+<li><a class="reference internal" href="search.html"><em>Search Page</em></a></li>
	+</ul>
	+</div>
	+
	+
	+ </div>
	+ </div>
	+ </div>
	+ <div class="sphinxsidebar">
	+ <div class="sphinxsidebarwrapper">
	+ <h3><a href="#">Table Of Contents</a></h3>
	+ <ul>
	+<li><a class="reference internal" href="#">Welcome to pNbody’s documentation!</a><ul>
	+</ul>
	+</li>
	+<li><a class="reference internal" href="#indices-and-tables">Indices and tables</a></li>
	+</ul>
	+
	+ <h4>Next topic</h4>
	+ <p class="topless"><a href="rst/Overview.html"
	+ title="next chapter">Overview</a></p>
	+ <h3>This Page</h3>
	+ <ul class="this-page-menu">
	+ <li><a href="_sources/index.txt"
	+ rel="nofollow">Show Source</a></li>
	+ </ul>
	+<div id="searchbox" style="display: none">
	+ <h3>Quick search</h3>
	+ <form class="search" action="search.html" method="get">
	+ <input type="text" name="q" size="18" />
	+ <input type="submit" value="Go" />
	+ <input type="hidden" name="check_keywords" value="yes" />
	+ <input type="hidden" name="area" value="default" />
	+ </form>
	+ <p class="searchtip" style="font-size: 90%">
	+ Enter search terms or a module, class or function name.
	+ </p>
	+</div>
	+<script type="text/javascript">$('#searchbox').show(0);</script>
	+ </div>
	+ </div>
	+ <div class="clearer"></div>
	+ </div>
	+ <div class="related">
	+ <h3>Navigation</h3>
	+ <ul>
	+ <li class="right" style="margin-right: 10px">
	+ <a href="genindex.html" title="General Index"
	+ >index</a></li>
	+ <li class="right" >
	+ <a href="rst/Overview.html" title="Overview"
	+ >next</a> \|</li>
	+ <li><a href="#">pNbody v4 documentation</a> »</li>
	+ </ul>
	+ </div>
	+ <div class="footer">
	+ © Copyright 2011, Yves Revaz.
	+ Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.4.
	+ </div>
	+ </body>
	+</html>
	\ No newline at end of file
	diff --git a/Doc/newdoc/_build/html/objects.inv b/Doc/newdoc/_build/html/objects.inv
	new file mode 100644
	index 0000000..8633b6c
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/objects.inv
	@@ -0,0 +1,6 @@
	+# Sphinx inventory version 2
	+# Project: pNbody
	+# Version: 4
	+# The remainder of this file is compressed using zlib.
	+xÚA
	+Â0E÷=ÅnSé¶7èB<@IIL3%¢¹½DPpÑí÷?¶^ã"ëÖÉ$ær¨'ÝÎ¤WÐ½Q5¢ÿ}h)²Q5ýí«±Z.éT[ª#ÅÛÖ¬^±% È§rxñå« ÕÝØmáÞâ,c/Ciw^÷dú^µv³
	\ No newline at end of file
	diff --git a/Doc/newdoc/_build/html/rst/Io.html b/Doc/newdoc/_build/html/rst/Io.html
	new file mode 100644
	index 0000000..d0c49b8
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/rst/Io.html
	@@ -0,0 +1,264 @@
	+
	+
	+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
	+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	+
	+<html xmlns="http://www.w3.org/1999/xhtml">
	+ <head>
	+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	+
	+ <title>the Io module — pNbody v4 documentation</title>
	+ <link rel="stylesheet" href="../_static/default.css" type="text/css" />
	+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
	+ <script type="text/javascript">
	+ var DOCUMENTATION_OPTIONS = {
	+ URL_ROOT: '../',
	+ VERSION: '4',
	+ COLLAPSE_INDEX: false,
	+ FILE_SUFFIX: '.html',
	+ HAS_SOURCE: true
	+ };
	+ </script>
	+ <script type="text/javascript" src="../_static/jquery.js"></script>
	+ <script type="text/javascript" src="../_static/underscore.js"></script>
	+ <script type="text/javascript" src="../_static/doctools.js"></script>
	+ <link rel="top" title="pNbody v4 documentation" href="../index.html" />
	+ <link rel="prev" title="Overview" href="Overview.html" />
	+ </head>
	+ <body>
	+ <div class="related">
	+ <h3>Navigation</h3>
	+ <ul>
	+ <li class="right" style="margin-right: 10px">
	+ <a href="../genindex.html" title="General Index"
	+ accesskey="I">index</a></li>
	+ <li class="right" >
	+ <a href="Overview.html" title="Overview"
	+ accesskey="P">previous</a> \|</li>
	+ <li><a href="../index.html">pNbody v4 documentation</a> »</li>
	+ </ul>
	+ </div>
	+
	+ <div class="document">
	+ <div class="documentwrapper">
	+ <div class="bodywrapper">
	+ <div class="body">
	+
	+ <div class="section" id="the-io-module">
	+<h1>the Io module<a class="headerlink" href="#the-io-module" title="Permalink to this headline">Â¶</a></h1>
	+<dl class="function">
	+<dt id="pNbody.io.checkfile">
	+<tt class="descclassname">pNbody.io.</tt><tt class="descname">checkfile</tt><big>(</big><em>name</em><big>)</big><a class="headerlink" href="#pNbody.io.checkfile" title="Permalink to this definition">Â¶</a></dt>
	+<dd><p>Check if a file exists. An error is generated if the file
	+does not exists.</p>
	+<table class="docutils field-list" frame="void" rules="none">
	+<col class="field-name" />
	+<col class="field-body" />
	+<tbody valign="top">
	+<tr class="field"><th class="field-name">Parameters :</th><td class="field-body"><strong>name</strong> : the path to a filename</td>
	+</tr>
	+<tr class="field"><th class="field-name">Returns :</th><td class="field-body"><strong>None</strong> :</td>
	+</tr>
	+</tbody>
	+</table>
	+<p class="rubric">Examples</p>
	+<div class="highlight-python"><div class="highlight"><pre><span class="gp">>>> </span><span class="n">io</span><span class="o">.</span><span class="n">checkfile</span><span class="p">(</span><span class="s">'an_existing_file'</span><span class="p">)</span>
	+<span class="gp">>>> </span>
	+</pre></div>
	+</div>
	+<div class="highlight-python"><div class="highlight"><pre><span class="gp">>>> </span><span class="n">io</span><span class="o">.</span><span class="n">checkfile</span><span class="p">(</span><span class="s">'a_non_existing_file'</span><span class="p">)</span>
	+<span class="gt">Traceback (most recent call last):</span>
	+ File <span class="nb">"<stdin>"</span>, line <span class="m">1</span>, in <span class="n-Identifier"><module></span>
	+ File <span class="nb">"/home/epfl/revaz/local/lib64/python2.6/site-packages/pNbody/io.py"</span>, line <span class="m">33</span>, in <span class="n-Identifier">checkfile</span>
	+ <span class="k">raise</span> <span class="ne">IOError</span><span class="p">(</span><span class="mi">915</span><span class="p">,</span><span class="s">'file </span><span class="si">%s</span><span class="s"> not found ! Pease check the file name.'</span><span class="o">%</span><span class="p">(</span><span class="n">name</span><span class="p">))</span>
	+<span class="nc">IOError</span>: <span class="n-Identifier">[Errno 915] file nofile not found ! Pease check the file name. </span>
	+</pre></div>
	+</div>
	+</dd></dl>
	+
	+<dl class="function">
	+<dt id="pNbody.io.end_of_file">
	+<tt class="descclassname">pNbody.io.</tt><tt class="descname">end_of_file</tt><big>(</big><em>f</em>, <em>pio='no'</em>, <em>MPI=None</em><big>)</big><a class="headerlink" href="#pNbody.io.end_of_file" title="Permalink to this definition">Â¶</a></dt>
	+<dd><p>Return True if we have reached the end of the file f, False instead</p>
	+<table class="docutils field-list" frame="void" rules="none">
	+<col class="field-name" />
	+<col class="field-body" />
	+<tbody valign="top">
	+<tr class="field"><th class="field-name">Parameters :</th><td class="field-body"><p class="first"><strong>f</strong> : ndarray or matrix object</p>
	+<blockquote>
	+<p>an open file</p>
	+</blockquote>
	+<p><strong>pio</strong> : ‘yes’ or ‘no’</p>
	+<blockquote>
	+<p>if the file is read in parallel or not</p>
	+</blockquote>
	+<p><strong>MPI</strong> : MPI communicator</p>
	+</td>
	+</tr>
	+<tr class="field"><th class="field-name">Returns :</th><td class="field-body"><p class="first"><strong>status</strong> : Bool</p>
	+<blockquote class="last">
	+<p>True if the we reached the end of the file
	+False if not</p>
	+</blockquote>
	+</td>
	+</tr>
	+</tbody>
	+</table>
	+</dd></dl>
	+
	+<dl class="function">
	+<dt id="pNbody.io.write_array">
	+<tt class="descclassname">pNbody.io.</tt><tt class="descname">write_array</tt><big>(</big><em>file</em>, <em>vec</em><big>)</big><a class="headerlink" href="#pNbody.io.write_array" title="Permalink to this definition">Â¶</a></dt>
	+<dd><p>Write an array to a file.</p>
	+<table class="docutils field-list" frame="void" rules="none">
	+<col class="field-name" />
	+<col class="field-body" />
	+<tbody valign="top">
	+<tr class="field"><th class="field-name">Parameters :</th><td class="field-body"><p class="first"><strong>file</strong> : the path to a file</p>
	+<p class="last"><strong>vec</strong> : an ndarray object</p>
	+</td>
	+</tr>
	+</tbody>
	+</table>
	+<p class="rubric">Examples</p>
	+<div class="highlight-python"><div class="highlight"><pre><span class="gp">>>> </span><span class="kn">from</span> <span class="nn">numpy</span> <span class="kn">import</span> <span class="o">*</span>
	+<span class="gp">>>> </span><span class="n">x</span> <span class="o">=</span> <span class="n">array</span><span class="p">([</span><span class="mi">1</span><span class="p">,</span><span class="mi">2</span><span class="p">,</span><span class="mi">3</span><span class="p">])</span>
	+<span class="gp">>>> </span><span class="n">io</span><span class="o">.</span><span class="n">write_array</span><span class="p">(</span><span class="s">'/tmp/array.dat'</span><span class="p">,</span><span class="n">x</span><span class="p">)</span>
	+</pre></div>
	+</div>
	+</dd></dl>
	+
	+<dl class="function">
	+<dt id="pNbody.io.testfct">
	+<tt class="descclassname">pNbody.io.</tt><tt class="descname">testfct</tt><big>(</big><big>)</big><a class="headerlink" href="#pNbody.io.testfct" title="Permalink to this definition">Â¶</a></dt>
	+<dd><p>Raise a square matrix to the (integer) power <cite>n</cite>.</p>
	+<p>For positive integers <cite>n</cite>, the power is computed by repeated matrix
	+squarings and matrix multiplications. If <tt class="docutils literal"><span class="pre">n</span> <span class="pre">==</span> <span class="pre">0</span></tt>, the identity matrix
	+of the same shape as M is returned. If <tt class="docutils literal"><span class="pre">n</span> <span class="pre"><</span> <span class="pre">0</span></tt>, the inverse
	+is computed and then raised to the <tt class="docutils literal"><span class="pre">abs(n)</span></tt>.</p>
	+<table class="docutils field-list" frame="void" rules="none">
	+<col class="field-name" />
	+<col class="field-body" />
	+<tbody valign="top">
	+<tr class="field"><th class="field-name">Parameters :</th><td class="field-body"><p class="first"><strong>M</strong> : ndarray or matrix object</p>
	+<blockquote>
	+<p>Matrix to be “powered.” Must be square, i.e. <tt class="docutils literal"><span class="pre">M.shape</span> <span class="pre">==</span> <span class="pre">(m,</span> <span class="pre">m)</span></tt>,
	+with <cite>m</cite> a positive integer.</p>
	+</blockquote>
	+<p><strong>n</strong> : int</p>
	+<blockquote>
	+<p>The exponent can be any integer or long integer, positive,
	+negative, or zero.</p>
	+</blockquote>
	+</td>
	+</tr>
	+<tr class="field"><th class="field-name">Returns :</th><td class="field-body"><p class="first"><strong>M**n</strong> : ndarray or matrix object</p>
	+<blockquote>
	+<p>The return value is the same shape and type as <cite>M</cite>;
	+if the exponent is positive or zero then the type of the
	+elements is the same as those of <cite>M</cite>. If the exponent is
	+negative the elements are floating-point.</p>
	+</blockquote>
	+</td>
	+</tr>
	+<tr class="field"><th class="field-name">Raises :</th><td class="field-body"><p class="first"><strong>LinAlgError</strong> :</p>
	+<blockquote class="last">
	+<p>If the matrix is not numerically invertible.</p>
	+</blockquote>
	+</td>
	+</tr>
	+</tbody>
	+</table>
	+<div class="admonition-see-also admonition seealso">
	+<p class="first admonition-title">See also</p>
	+<dl class="last docutils">
	+<dt><tt class="xref py py-obj docutils literal"><span class="pre">matrix</span></tt></dt>
	+<dd>Provides an equivalent function as the exponentiation operator (<tt class="docutils literal"><span class="pre">**</span></tt>, not <tt class="docutils literal"><span class="pre">^</span></tt>).</dd>
	+</dl>
	+</div>
	+<p class="rubric">Examples</p>
	+<div class="highlight-python"><div class="highlight"><pre><span class="gp">>>> </span><span class="kn">from</span> <span class="nn">numpy</span> <span class="kn">import</span> <span class="n">linalg</span> <span class="k">as</span> <span class="n">LA</span>
	+<span class="gp">>>> </span><span class="n">i</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">([[</span><span class="mi">0</span><span class="p">,</span> <span class="mi">1</span><span class="p">],</span> <span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">,</span> <span class="mi">0</span><span class="p">]])</span> <span class="c"># matrix equiv. of the imaginary unit</span>
	+<span class="gp">>>> </span><span class="n">LA</span><span class="o">.</span><span class="n">matrix_power</span><span class="p">(</span><span class="n">i</span><span class="p">,</span> <span class="mi">3</span><span class="p">)</span> <span class="c"># should = -i</span>
	+<span class="go">array([[ 0, -1],</span>
	+<span class="go"> [ 1, 0]])</span>
	+<span class="gp">>>> </span><span class="n">LA</span><span class="o">.</span><span class="n">matrix_power</span><span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">matrix</span><span class="p">(</span><span class="n">i</span><span class="p">),</span> <span class="mi">3</span><span class="p">)</span> <span class="c"># matrix arg returns matrix</span>
	+<span class="go">matrix([[ 0, -1],</span>
	+<span class="go"> [ 1, 0]])</span>
	+<span class="gp">>>> </span><span class="n">LA</span><span class="o">.</span><span class="n">matrix_power</span><span class="p">(</span><span class="n">i</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
	+<span class="go">array([[1, 0],</span>
	+<span class="go"> [0, 1]])</span>
	+<span class="gp">>>> </span><span class="n">LA</span><span class="o">.</span><span class="n">matrix_power</span><span class="p">(</span><span class="n">i</span><span class="p">,</span> <span class="o">-</span><span class="mi">3</span><span class="p">)</span> <span class="c"># should = 1/(-i) = i, but w/ f.p. elements</span>
	+<span class="go">array([[ 0., 1.],</span>
	+<span class="go"> [-1., 0.]])</span>
	+</pre></div>
	+</div>
	+<p>Somewhat more sophisticated example</p>
	+<div class="highlight-python"><div class="highlight"><pre><span class="gp">>>> </span><span class="n">q</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">((</span><span class="mi">4</span><span class="p">,</span> <span class="mi">4</span><span class="p">))</span>
	+<span class="gp">>>> </span><span class="n">q</span><span class="p">[</span><span class="mi">0</span><span class="p">:</span><span class="mi">2</span><span class="p">,</span> <span class="mi">0</span><span class="p">:</span><span class="mi">2</span><span class="p">]</span> <span class="o">=</span> <span class="o">-</span><span class="n">i</span>
	+<span class="gp">>>> </span><span class="n">q</span><span class="p">[</span><span class="mi">2</span><span class="p">:</span><span class="mi">4</span><span class="p">,</span> <span class="mi">2</span><span class="p">:</span><span class="mi">4</span><span class="p">]</span> <span class="o">=</span> <span class="n">i</span>
	+<span class="gp">>>> </span><span class="n">q</span> <span class="c"># one of the three quarternion units not equal to 1</span>
	+<span class="go">array([[ 0., -1., 0., 0.],</span>
	+<span class="go"> [ 1., 0., 0., 0.],</span>
	+<span class="go"> [ 0., 0., 0., 1.],</span>
	+<span class="go"> [ 0., 0., -1., 0.]])</span>
	+<span class="gp">>>> </span><span class="n">LA</span><span class="o">.</span><span class="n">matrix_power</span><span class="p">(</span><span class="n">q</span><span class="p">,</span> <span class="mi">2</span><span class="p">)</span> <span class="c"># = -np.eye(4)</span>
	+<span class="go">array([[-1., 0., 0., 0.],</span>
	+<span class="go"> [ 0., -1., 0., 0.],</span>
	+<span class="go"> [ 0., 0., -1., 0.],</span>
	+<span class="go"> [ 0., 0., 0., -1.]])</span>
	+</pre></div>
	+</div>
	+</dd></dl>
	+
	+</div>
	+
	+
	+ </div>
	+ </div>
	+ </div>
	+ <div class="sphinxsidebar">
	+ <div class="sphinxsidebarwrapper">
	+ <h4>Previous topic</h4>
	+ <p class="topless"><a href="Overview.html"
	+ title="previous chapter">Overview</a></p>
	+ <h3>This Page</h3>
	+ <ul class="this-page-menu">
	+ <li><a href="../_sources/rst/Io.txt"
	+ rel="nofollow">Show Source</a></li>
	+ </ul>
	+<div id="searchbox" style="display: none">
	+ <h3>Quick search</h3>
	+ <form class="search" action="../search.html" method="get">
	+ <input type="text" name="q" size="18" />
	+ <input type="submit" value="Go" />
	+ <input type="hidden" name="check_keywords" value="yes" />
	+ <input type="hidden" name="area" value="default" />
	+ </form>
	+ <p class="searchtip" style="font-size: 90%">
	+ Enter search terms or a module, class or function name.
	+ </p>
	+</div>
	+<script type="text/javascript">$('#searchbox').show(0);</script>
	+ </div>
	+ </div>
	+ <div class="clearer"></div>
	+ </div>
	+ <div class="related">
	+ <h3>Navigation</h3>
	+ <ul>
	+ <li class="right" style="margin-right: 10px">
	+ <a href="../genindex.html" title="General Index"
	+ >index</a></li>
	+ <li class="right" >
	+ <a href="Overview.html" title="Overview"
	+ >previous</a> \|</li>
	+ <li><a href="../index.html">pNbody v4 documentation</a> »</li>
	+ </ul>
	+ </div>
	+ <div class="footer">
	+ © Copyright 2011, Yves Revaz.
	+ Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.4.
	+ </div>
	+ </body>
	+</html>
	\ No newline at end of file
	diff --git a/Doc/newdoc/_build/html/rst/Overview.html b/Doc/newdoc/_build/html/rst/Overview.html
	new file mode 100644
	index 0000000..26b0200
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/rst/Overview.html
	@@ -0,0 +1,109 @@
	+
	+
	+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
	+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	+
	+<html xmlns="http://www.w3.org/1999/xhtml">
	+ <head>
	+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	+
	+ <title>Overview — pNbody v4 documentation</title>
	+ <link rel="stylesheet" href="../_static/default.css" type="text/css" />
	+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
	+ <script type="text/javascript">
	+ var DOCUMENTATION_OPTIONS = {
	+ URL_ROOT: '../',
	+ VERSION: '4',
	+ COLLAPSE_INDEX: false,
	+ FILE_SUFFIX: '.html',
	+ HAS_SOURCE: true
	+ };
	+ </script>
	+ <script type="text/javascript" src="../_static/jquery.js"></script>
	+ <script type="text/javascript" src="../_static/underscore.js"></script>
	+ <script type="text/javascript" src="../_static/doctools.js"></script>
	+ <link rel="top" title="pNbody v4 documentation" href="../index.html" />
	+ <link rel="next" title="the Io module" href="Io.html" />
	+ <link rel="prev" title="Welcome to pNbodyâs documentation!" href="../index.html" />
	+ </head>
	+ <body>
	+ <div class="related">
	+ <h3>Navigation</h3>
	+ <ul>
	+ <li class="right" style="margin-right: 10px">
	+ <a href="../genindex.html" title="General Index"
	+ accesskey="I">index</a></li>
	+ <li class="right" >
	+ <a href="Io.html" title="the Io module"
	+ accesskey="N">next</a> \|</li>
	+ <li class="right" >
	+ <a href="../index.html" title="Welcome to pNbodyâs documentation!"
	+ accesskey="P">previous</a> \|</li>
	+ <li><a href="../index.html">pNbody v4 documentation</a> »</li>
	+ </ul>
	+ </div>
	+
	+ <div class="document">
	+ <div class="documentwrapper">
	+ <div class="bodywrapper">
	+ <div class="body">
	+
	+ <div class="section" id="overview">
	+<h1>Overview<a class="headerlink" href="#overview" title="Permalink to this headline">Â¶</a></h1>
	+</div>
	+
	+
	+ </div>
	+ </div>
	+ </div>
	+ <div class="sphinxsidebar">
	+ <div class="sphinxsidebarwrapper">
	+ <h4>Previous topic</h4>
	+ <p class="topless"><a href="../index.html"
	+ title="previous chapter">Welcome to pNbody’s documentation!</a></p>
	+ <h4>Next topic</h4>
	+ <p class="topless"><a href="Io.html"
	+ title="next chapter">the Io module</a></p>
	+ <h3>This Page</h3>
	+ <ul class="this-page-menu">
	+ <li><a href="../_sources/rst/Overview.txt"
	+ rel="nofollow">Show Source</a></li>
	+ </ul>
	+<div id="searchbox" style="display: none">
	+ <h3>Quick search</h3>
	+ <form class="search" action="../search.html" method="get">
	+ <input type="text" name="q" size="18" />
	+ <input type="submit" value="Go" />
	+ <input type="hidden" name="check_keywords" value="yes" />
	+ <input type="hidden" name="area" value="default" />
	+ </form>
	+ <p class="searchtip" style="font-size: 90%">
	+ Enter search terms or a module, class or function name.
	+ </p>
	+</div>
	+<script type="text/javascript">$('#searchbox').show(0);</script>
	+ </div>
	+ </div>
	+ <div class="clearer"></div>
	+ </div>
	+ <div class="related">
	+ <h3>Navigation</h3>
	+ <ul>
	+ <li class="right" style="margin-right: 10px">
	+ <a href="../genindex.html" title="General Index"
	+ >index</a></li>
	+ <li class="right" >
	+ <a href="Io.html" title="the Io module"
	+ >next</a> \|</li>
	+ <li class="right" >
	+ <a href="../index.html" title="Welcome to pNbodyâs documentation!"
	+ >previous</a> \|</li>
	+ <li><a href="../index.html">pNbody v4 documentation</a> »</li>
	+ </ul>
	+ </div>
	+ <div class="footer">
	+ © Copyright 2011, Yves Revaz.
	+ Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.4.
	+ </div>
	+ </body>
	+</html>
	\ No newline at end of file
	diff --git a/Doc/newdoc/_build/html/search.html b/Doc/newdoc/_build/html/search.html
	new file mode 100644
	index 0000000..1eb9483
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/search.html
	@@ -0,0 +1,96 @@
	+
	+
	+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
	+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	+
	+<html xmlns="http://www.w3.org/1999/xhtml">
	+ <head>
	+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	+
	+ <title>Search — pNbody v4 documentation</title>
	+ <link rel="stylesheet" href="_static/default.css" type="text/css" />
	+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
	+ <script type="text/javascript">
	+ var DOCUMENTATION_OPTIONS = {
	+ URL_ROOT: '',
	+ VERSION: '4',
	+ COLLAPSE_INDEX: false,
	+ FILE_SUFFIX: '.html',
	+ HAS_SOURCE: true
	+ };
	+ </script>
	+ <script type="text/javascript" src="_static/jquery.js"></script>
	+ <script type="text/javascript" src="_static/underscore.js"></script>
	+ <script type="text/javascript" src="_static/doctools.js"></script>
	+ <script type="text/javascript" src="_static/searchtools.js"></script>
	+ <link rel="top" title="pNbody v4 documentation" href="index.html" />
	+ <script type="text/javascript">
	+ jQuery(function() { Search.loadIndex("searchindex.js"); });
	+ </script>
	+
	+
	+ </head>
	+ <body>
	+ <div class="related">
	+ <h3>Navigation</h3>
	+ <ul>
	+ <li class="right" style="margin-right: 10px">
	+ <a href="genindex.html" title="General Index"
	+ accesskey="I">index</a></li>
	+ <li><a href="index.html">pNbody v4 documentation</a> »</li>
	+ </ul>
	+ </div>
	+
	+ <div class="document">
	+ <div class="documentwrapper">
	+ <div class="bodywrapper">
	+ <div class="body">
	+
	+ <h1 id="search-documentation">Search</h1>
	+ <div id="fallback" class="admonition warning">
	+ <script type="text/javascript">$('#fallback').hide();</script>
	+ <p>
	+ Please activate JavaScript to enable the search
	+ functionality.
	+ </p>
	+ </div>
	+ <p>
	+ From here you can search these documents. Enter your search
	+ words into the box below and click "search". Note that the search
	+ function will automatically search for all of the words. Pages
	+ containing fewer words won't appear in the result list.
	+ </p>
	+ <form action="" method="get">
	+ <input type="text" name="q" value="" />
	+ <input type="submit" value="search" />
	+ <span id="search-progress" style="padding-left: 10px"></span>
	+ </form>
	+
	+ <div id="search-results">
	+
	+ </div>
	+
	+ </div>
	+ </div>
	+ </div>
	+ <div class="sphinxsidebar">
	+ <div class="sphinxsidebarwrapper">
	+ </div>
	+ </div>
	+ <div class="clearer"></div>
	+ </div>
	+ <div class="related">
	+ <h3>Navigation</h3>
	+ <ul>
	+ <li class="right" style="margin-right: 10px">
	+ <a href="genindex.html" title="General Index"
	+ >index</a></li>
	+ <li><a href="index.html">pNbody v4 documentation</a> »</li>
	+ </ul>
	+ </div>
	+ <div class="footer">
	+ © Copyright 2011, Yves Revaz.
	+ Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.4.
	+ </div>
	+ </body>
	+</html>
	\ No newline at end of file
	diff --git a/Doc/newdoc/_build/html/searchindex.js b/Doc/newdoc/_build/html/searchindex.js
	new file mode 100644
	index 0000000..313287c
	--- /dev/null
	+++ b/Doc/newdoc/_build/html/searchindex.js
	@@ -0,0 +1 @@
	+Search.setIndex({objects:{"pNbody.io":{write_array:[0,0,1],checkfile:[0,0,1],testfct:[0,0,1],end_of_file:[0,0,1]}},terms:{testfct:0,checkfil:0,shape:0,end_of_fil:0,paramet:0,also:0,should:0,vec:0,input:[],expon:0,local:0,modul:[0,1],"return":0,read:0,mpi:0,dat:0,python2:0,name:0,quarternion:0,integ:0,found:0,path:0,revaz:0,page:1,zero:0,arg:0,home:0,tmp:0,index:1,statu:0,matrix:0,neg:0,content:1,matrix_pow:0,an_existing_fil:0,"import":0,lib64:0,equiv:0,imaginari:0,nofil:0,power:0,numer:0,gener:0,sophist:0,linalgerror:0,element:0,epfl:0,interpret:[],search:1,last:0,traceback:0,equal:0,oper:0,point:0,overview:[1,2],arrai:0,"float":0,three:0,filenam:0,unlik:[],alreadi:[],ioerror:0,comput:0,open:0,unit:0,from:0,exponenti:0,errno:0,invert:0,numpi:0,invers:0,"long":0,call:0,valu:0,recent:0,type:0,more:0,"function":0,linalg:0,copi:[],ani:0,somewhat:0,line:0,"true":0,those:0,must:0,commun:0,none:0,ident:0,provid:0,see:0,can:0,error:0,posit:0,write_arrai:0,file:0,pio:0,"int":0,site:0,indic:1,packag:0,exist:0,have:0,tabl:1,asmatrix:[],ascii:[],check:0,end:0,welcom:1,a_non_existing_fil:0,pnbodi:[0,1],make:[],same:0,write:0,fals:0,bool:0,instead:0,document:1,repeat:0,mat:[],object:0,reach:0,peas:0,ndarrai:0,most:0,rais:0,multipl:0,data:[],parallel:0,squar:0,equival:0,array_lik:[],stdin:0,doe:0,exampl:0},objtypes:{"0":"py:function"},titles:["the Io module","Welcome to pNbody’s documentation!","Overview"],objnames:{"0":"Python function"},filenames:["rst/Io","index","rst/Overview"]})
	\ No newline at end of file
	diff --git a/Doc/newdoc/conf.py b/Doc/newdoc/conf.py
	new file mode 100644
	index 0000000..ad6140a
	--- /dev/null
	+++ b/Doc/newdoc/conf.py
	@@ -0,0 +1,263 @@
	+# -- coding: utf-8 --
	+#
	+# pNbody documentation build configuration file, created by
	+# sphinx-quickstart on Wed Aug 24 16:29:02 2011.
	+#
	+# This file is execfile()d with the current directory set to its containing dir.
	+#
	+# Note that not all possible configuration values are present in this
	+# autogenerated file.
	+#
	+# All configuration values have a default; values that are commented out
	+# serve to show the default.
	+
	+import sys, os
	+
	+# If extensions (or modules to document with autodoc) are in another directory,
	+# add these directories to sys.path here. If the directory is relative to the
	+# documentation root, use os.path.abspath to make it absolute, like shown here.
	+#sys.path.insert(0, os.path.abspath('.'))
	+
	+# -- General configuration -----------------------------------------------------
	+
	+# If your documentation needs a minimal Sphinx version, state it here.
	+#needs_sphinx = '1.0'
	+
	+# Add any Sphinx extension module names here, as strings. They can be extensions
	+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
	+
	+sys.path.insert(0, os.path.abspath('./sphinxext'))
	+
	+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.pngmath','numpydoc']
	+
	+# Add any paths that contain templates here, relative to this directory.
	+templates_path = ['_templates']
	+
	+# The suffix of source filenames.
	+source_suffix = '.rst'
	+
	+# The encoding of source files.
	+#source_encoding = 'utf-8-sig'
	+
	+# The master toctree document.
	+master_doc = 'index'
	+
	+# General information about the project.
	+project = u'pNbody'
	+copyright = u'2011, Yves Revaz'
	+
	+# The version info for the project you're documenting, acts as replacement for
	+# \|version\| and \|release\|, also used in various other places throughout the
	+# built documents.
	+#
	+# The short X.Y version.
	+version = '4'
	+# The full version, including alpha/beta/rc tags.
	+release = '4'
	+
	+# The language for content autogenerated by Sphinx. Refer to documentation
	+# for a list of supported languages.
	+#language = None
	+
	+# There are two options for replacing \|today\|: either, you set today to some
	+# non-false value, then it is used:
	+#today = ''
	+# Else, today_fmt is used as the format for a strftime call.
	+#today_fmt = '%B %d, %Y'
	+
	+# List of patterns, relative to source directory, that match files and
	+# directories to ignore when looking for source files.
	+exclude_patterns = ['_build']
	+
	+# The reST default role (used for this markup: `text`) to use for all documents.
	+#default_role = None
	+
	+# If true, '()' will be appended to :func: etc. cross-reference text.
	+#add_function_parentheses = True
	+
	+# If true, the current module name will be prepended to all description
	+# unit titles (such as .. function::).
	+#add_module_names = True
	+
	+# If true, sectionauthor and moduleauthor directives will be shown in the
	+# output. They are ignored by default.
	+#show_authors = False
	+
	+# The name of the Pygments (syntax highlighting) style to use.
	+pygments_style = 'sphinx'
	+
	+# A list of ignored prefixes for module index sorting.
	+#modindex_common_prefix = []
	+
	+
	+# -- Options for HTML output ---------------------------------------------------
	+
	+# The theme to use for HTML and HTML Help pages. See the documentation for
	+# a list of builtin themes.
	+html_theme = 'default'
	+
	+# Theme options are theme-specific and customize the look and feel of a theme
	+# further. For a list of options available for each theme, see the
	+# documentation.
	+#html_theme_options = {}
	+
	+# Add any paths that contain custom themes here, relative to this directory.
	+#html_theme_path = []
	+
	+# The name for this set of Sphinx documents. If None, it defaults to
	+# "<project> v<release> documentation".
	+#html_title = None
	+
	+# A shorter title for the navigation bar. Default is the same as html_title.
	+#html_short_title = None
	+
	+# The name of an image file (relative to this directory) to place at the top
	+# of the sidebar.
	+#html_logo = None
	+
	+# The name of an image file (within the static path) to use as favicon of the
	+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
	+# pixels large.
	+#html_favicon = None
	+
	+# Add any paths that contain custom static files (such as style sheets) here,
	+# relative to this directory. They are copied after the builtin static files,
	+# so a file named "default.css" will overwrite the builtin "default.css".
	+html_static_path = ['_static']
	+
	+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
	+# using the given strftime format.
	+#html_last_updated_fmt = '%b %d, %Y'
	+
	+# If true, SmartyPants will be used to convert quotes and dashes to
	+# typographically correct entities.
	+#html_use_smartypants = True
	+
	+# Custom sidebar templates, maps document names to template names.
	+#html_sidebars = {}
	+
	+# Additional templates that should be rendered to pages, maps page names to
	+# template names.
	+#html_additional_pages = {}
	+
	+# If false, no module index is generated.
	+#html_domain_indices = True
	+
	+# If false, no index is generated.
	+#html_use_index = True
	+
	+# If true, the index is split into individual pages for each letter.
	+#html_split_index = False
	+
	+# If true, links to the reST sources are added to the pages.
	+#html_show_sourcelink = True
	+
	+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
	+#html_show_sphinx = True
	+
	+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
	+#html_show_copyright = True
	+
	+# If true, an OpenSearch description file will be output, and all pages will
	+# contain a <link> tag referring to it. The value of this option must be the
	+# base URL from which the finished HTML is served.
	+#html_use_opensearch = ''
	+
	+# This is the file name suffix for HTML files (e.g. ".xhtml").
	+#html_file_suffix = None
	+
	+# Output file base name for HTML help builder.
	+htmlhelp_basename = 'pNbodydoc'
	+
	+
	+# -- Options for LaTeX output --------------------------------------------------
	+
	+# The paper size ('letter' or 'a4').
	+#latex_paper_size = 'letter'
	+
	+# The font size ('10pt', '11pt' or '12pt').
	+#latex_font_size = '10pt'
	+
	+# Grouping the document tree into LaTeX files. List of tuples
	+# (source start file, target name, title, author, documentclass [howto/manual]).
	+latex_documents = [
	+ ('index', 'pNbody.tex', u'pNbody Documentation',
	+ u'Yves Revaz', 'manual'),
	+]
	+
	+# The name of an image file (relative to this directory) to place at the top of
	+# the title page.
	+#latex_logo = None
	+
	+# For "manual" documents, if this is true, then toplevel headings are parts,
	+# not chapters.
	+#latex_use_parts = False
	+
	+# If true, show page references after internal links.
	+#latex_show_pagerefs = False
	+
	+# If true, show URL addresses after external links.
	+#latex_show_urls = False
	+
	+# Additional stuff for the LaTeX preamble.
	+#latex_preamble = ''
	+
	+# Documents to append as an appendix to all manuals.
	+#latex_appendices = []
	+
	+# If false, no module index is generated.
	+#latex_domain_indices = True
	+
	+
	+# -- Options for manual page output --------------------------------------------
	+
	+# One entry per manual page. List of tuples
	+# (source start file, name, description, authors, manual section).
	+man_pages = [
	+ ('index', 'pnbody', u'pNbody Documentation',
	+ [u'Yves Revaz'], 1)
	+]
	+
	+
	+# -----------------------------------------------------------------------------
	+# Numpy extensions
	+# -----------------------------------------------------------------------------
	+
	+# If we want to do a phantom import from an XML file for all autodocs
	+#phantom_import_file = 'dump.xml'
	+
	+# Make numpydoc to generate plots for example sections
	+numpydoc_use_plots = True
	+
	+
	+
	+# -----------------------------------------------------------------------------
	+# Plots
	+# -----------------------------------------------------------------------------
	+plot_pre_code = """
	+import numpy as np
	+np.random.seed(0)
	+"""
	+plot_include_source = True
	+plot_formats = [('png', 100), 'pdf']
	+
	+import math
	+phi = (math.sqrt(5) + 1)/2
	+
	+import matplotlib
	+matplotlib.rcParams.update({
	+ 'font.size': 8,
	+ 'axes.titlesize': 8,
	+ 'axes.labelsize': 8,
	+ 'xtick.labelsize': 8,
	+ 'ytick.labelsize': 8,
	+ 'legend.fontsize': 8,
	+ 'figure.figsize': (3*phi, 3),
	+ 'figure.subplot.bottom': 0.2,
	+ 'figure.subplot.left': 0.2,
	+ 'figure.subplot.right': 0.9,
	+ 'figure.subplot.top': 0.85,
	+ 'figure.subplot.wspace': 0.4,
	+ 'text.usetex': False,
	+})
	+
	diff --git a/Doc/newdoc/index.rst b/Doc/newdoc/index.rst
	new file mode 100644
	index 0000000..28288c5
	--- /dev/null
	+++ b/Doc/newdoc/index.rst
	@@ -0,0 +1,23 @@
	+.. pNbody documentation master file, created by
	+ sphinx-quickstart on Wed Aug 24 16:29:02 2011.
	+ You can adapt this file completely to your liking, but it should at least
	+ contain the root `toctree` directive.
	+
	+Welcome to pNbody's documentation!
	+==================================
	+
	+Contents:
	+
	+.. toctree::
	+ :maxdepth: 2
	+
	+ rst/Overview
	+ rst/Io
	+
	+Indices and tables
	+==================
	+
	+* :ref:`genindex`
	+* :ref:`modindex`
	+* :ref:`search`
	+
	diff --git a/Doc/newdoc/rst/Io.rst b/Doc/newdoc/rst/Io.rst
	new file mode 100644
	index 0000000..66371f5
	--- /dev/null
	+++ b/Doc/newdoc/rst/Io.rst
	@@ -0,0 +1,11 @@
	+the Io module
	+**********************
	+
	+.. currentmodule:: pNbody.io
	+
	+.. autofunction:: checkfile
	+.. autofunction:: end_of_file
	+.. autofunction:: write_array
	+
	+.. autofunction:: testfct
	+
	diff --git a/Doc/newdoc/rst/Overview.rst b/Doc/newdoc/rst/Overview.rst
	new file mode 100644
	index 0000000..cf5b28c
	--- /dev/null
	+++ b/Doc/newdoc/rst/Overview.rst
	@@ -0,0 +1,7 @@
	+Overview
	+**********************
	+
	+
	+.. currentmodule:: pNbody.io
	+
	+
	diff --git a/Doc/newdoc/sphinxext/LICENSE.txt b/Doc/newdoc/sphinxext/LICENSE.txt
	new file mode 100644
	index 0000000..e00efc3
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/LICENSE.txt
	@@ -0,0 +1,97 @@
	+-------------------------------------------------------------------------------
	+ The files
	+ - numpydoc.py
	+ - autosummary.py
	+ - autosummary_generate.py
	+ - docscrape.py
	+ - docscrape_sphinx.py
	+ - phantom_import.py
	+ have the following license:
	+
	+Copyright (C) 2008 Stefan van der Walt <stefan@mentat.za.net>, Pauli Virtanen <pav@iki.fi>
	+
	+Redistribution and use in source and binary forms, with or without
	+modification, are permitted provided that the following conditions are
	+met:
	+
	+ 1. Redistributions of source code must retain the above copyright
	+ notice, this list of conditions and the following disclaimer.
	+ 2. Redistributions in binary form must reproduce the above copyright
	+ notice, this list of conditions and the following disclaimer in
	+ the documentation and/or other materials provided with the
	+ distribution.
	+
	+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
	+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	+DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
	+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
	+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
	+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
	+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
	+POSSIBILITY OF SUCH DAMAGE.
	+
	+-------------------------------------------------------------------------------
	+ The files
	+ - compiler_unparse.py
	+ - comment_eater.py
	+ - traitsdoc.py
	+ have the following license:
	+
	+This software is OSI Certified Open Source Software.
	+OSI Certified is a certification mark of the Open Source Initiative.
	+
	+Copyright (c) 2006, Enthought, Inc.
	+All rights reserved.
	+
	+Redistribution and use in source and binary forms, with or without
	+modification, are permitted provided that the following conditions are met:
	+
	+ * Redistributions of source code must retain the above copyright notice, this
	+ list of conditions and the following disclaimer.
	+ * Redistributions in binary form must reproduce the above copyright notice,
	+ this list of conditions and the following disclaimer in the documentation
	+ and/or other materials provided with the distribution.
	+ * Neither the name of Enthought, Inc. nor the names of its contributors may
	+ be used to endorse or promote products derived from this software without
	+ specific prior written permission.
	+
	+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
	+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
	+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
	+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
	+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	+
	+
	+-------------------------------------------------------------------------------
	+ The files
	+ - only_directives.py
	+ - plot_directive.py
	+ originate from Matplotlib (http://matplotlib.sf.net/) which has
	+ the following license:
	+
	+Copyright (c) 2002-2008 John D. Hunter; All Rights Reserved.
	+
	+1. This LICENSE AGREEMENT is between John D. Hunter (âJDHâ), and the Individual or Organization (âLicenseeâ) accessing and otherwise using matplotlib software in source or binary form and its associated documentation.
	+
	+2. Subject to the terms and conditions of this License Agreement, JDH hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use matplotlib 0.98.3 alone or in any derivative version, provided, however, that JDHâs License Agreement and JDHâs notice of copyright, i.e., âCopyright (c) 2002-2008 John D. Hunter; All Rights Reservedâ are retained in matplotlib 0.98.3 alone or in any derivative version prepared by Licensee.
	+
	+3. In the event Licensee prepares a derivative work that is based on or incorporates matplotlib 0.98.3 or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to matplotlib 0.98.3.
	+
	+4. JDH is making matplotlib 0.98.3 available to Licensee on an âAS ISâ basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.98.3 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
	+
	+5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB 0.98.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING MATPLOTLIB 0.98.3, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
	+
	+6. This License Agreement will automatically terminate upon a material breach of its terms and conditions.
	+
	+7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between JDH and Licensee. This License Agreement does not grant permission to use JDH trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party.
	+
	+8. By copying, installing or otherwise using matplotlib 0.98.3, Licensee agrees to be bound by the terms and conditions of this License Agreement.
	+
	diff --git a/Doc/newdoc/sphinxext/MANIFEST.in b/Doc/newdoc/sphinxext/MANIFEST.in
	new file mode 100644
	index 0000000..f88ed78
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/MANIFEST.in
	@@ -0,0 +1,2 @@
	+recursive-include tests *.py
	+include *.txt
	diff --git a/Doc/newdoc/sphinxext/README.txt b/Doc/newdoc/sphinxext/README.txt
	new file mode 100644
	index 0000000..6ba63e6
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/README.txt
	@@ -0,0 +1,45 @@
	+=====================================
	+numpydoc -- Numpy's Sphinx extensions
	+=====================================
	+
	+Numpy's documentation uses several custom extensions to Sphinx. These
	+are shipped in this ``numpydoc`` package, in case you want to make use
	+of them in third-party projects.
	+
	+The following extensions are available:
	+
	+ - ``numpydoc``: support for the Numpy docstring format in Sphinx, and add
	+ the code description directives ``np:function``, ``np-c:function``, etc.
	+ that support the Numpy docstring syntax.
	+
	+ - ``numpydoc.traitsdoc``: For gathering documentation about Traits attributes.
	+
	+ - ``numpydoc.plot_directive``: Adaptation of Matplotlib's ``plot::``
	+ directive. Note that this implementation may still undergo severe
	+ changes or eventually be deprecated.
	+
	+
	+numpydoc
	+========
	+
	+Numpydoc inserts a hook into Sphinx's autodoc that converts docstrings
	+following the Numpy/Scipy format to a form palatable to Sphinx.
	+
	+Options
	+-------
	+
	+The following options can be set in conf.py:
	+
	+- numpydoc_use_plots: bool
	+
	+ Whether to produce ``plot::`` directives for Examples sections that
	+ contain ``import matplotlib``.
	+
	+- numpydoc_show_class_members: bool
	+
	+ Whether to show all members of a class in the Methods and Attributes
	+ sections automatically.
	+
	+- numpydoc_edit_link: bool (DEPRECATED -- edit your HTML template instead)
	+
	+ Whether to insert an edit link after docstrings.
	diff --git a/Doc/newdoc/sphinxext/__init__.py b/Doc/newdoc/sphinxext/__init__.py
	new file mode 100644
	index 0000000..ae9073b
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/__init__.py
	@@ -0,0 +1 @@
	+from numpydoc import setup
	diff --git a/Doc/newdoc/sphinxext/comment_eater.py b/Doc/newdoc/sphinxext/comment_eater.py
	new file mode 100644
	index 0000000..e11eea9
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/comment_eater.py
	@@ -0,0 +1,158 @@
	+from cStringIO import StringIO
	+import compiler
	+import inspect
	+import textwrap
	+import tokenize
	+
	+from compiler_unparse import unparse
	+
	+
	+class Comment(object):
	+ """ A comment block.
	+ """
	+ is_comment = True
	+ def __init__(self, start_lineno, end_lineno, text):
	+ # int : The first line number in the block. 1-indexed.
	+ self.start_lineno = start_lineno
	+ # int : The last line number. Inclusive!
	+ self.end_lineno = end_lineno
	+ # str : The text block including '#' character but not any leading spaces.
	+ self.text = text
	+
	+ def add(self, string, start, end, line):
	+ """ Add a new comment line.
	+ """
	+ self.start_lineno = min(self.start_lineno, start[0])
	+ self.end_lineno = max(self.end_lineno, end[0])
	+ self.text += string
	+
	+ def __repr__(self):
	+ return '%s(%r, %r, %r)' % (self.__class__.__name__, self.start_lineno,
	+ self.end_lineno, self.text)
	+
	+
	+class NonComment(object):
	+ """ A non-comment block of code.
	+ """
	+ is_comment = False
	+ def __init__(self, start_lineno, end_lineno):
	+ self.start_lineno = start_lineno
	+ self.end_lineno = end_lineno
	+
	+ def add(self, string, start, end, line):
	+ """ Add lines to the block.
	+ """
	+ if string.strip():
	+ # Only add if not entirely whitespace.
	+ self.start_lineno = min(self.start_lineno, start[0])
	+ self.end_lineno = max(self.end_lineno, end[0])
	+
	+ def __repr__(self):
	+ return '%s(%r, %r)' % (self.__class__.__name__, self.start_lineno,
	+ self.end_lineno)
	+
	+
	+class CommentBlocker(object):
	+ """ Pull out contiguous comment blocks.
	+ """
	+ def __init__(self):
	+ # Start with a dummy.
	+ self.current_block = NonComment(0, 0)
	+
	+ # All of the blocks seen so far.
	+ self.blocks = []
	+
	+ # The index mapping lines of code to their associated comment blocks.
	+ self.index = {}
	+
	+ def process_file(self, file):
	+ """ Process a file object.
	+ """
	+ for token in tokenize.generate_tokens(file.next):
	+ self.process_token(*token)
	+ self.make_index()
	+
	+ def process_token(self, kind, string, start, end, line):
	+ """ Process a single token.
	+ """
	+ if self.current_block.is_comment:
	+ if kind == tokenize.COMMENT:
	+ self.current_block.add(string, start, end, line)
	+ else:
	+ self.new_noncomment(start[0], end[0])
	+ else:
	+ if kind == tokenize.COMMENT:
	+ self.new_comment(string, start, end, line)
	+ else:
	+ self.current_block.add(string, start, end, line)
	+
	+ def new_noncomment(self, start_lineno, end_lineno):
	+ """ We are transitioning from a noncomment to a comment.
	+ """
	+ block = NonComment(start_lineno, end_lineno)
	+ self.blocks.append(block)
	+ self.current_block = block
	+
	+ def new_comment(self, string, start, end, line):
	+ """ Possibly add a new comment.
	+
	+ Only adds a new comment if this comment is the only thing on the line.
	+ Otherwise, it extends the noncomment block.
	+ """
	+ prefix = line[:start[1]]
	+ if prefix.strip():
	+ # Oops! Trailing comment, not a comment block.
	+ self.current_block.add(string, start, end, line)
	+ else:
	+ # A comment block.
	+ block = Comment(start[0], end[0], string)
	+ self.blocks.append(block)
	+ self.current_block = block
	+
	+ def make_index(self):
	+ """ Make the index mapping lines of actual code to their associated
	+ prefix comments.
	+ """
	+ for prev, block in zip(self.blocks[:-1], self.blocks[1:]):
	+ if not block.is_comment:
	+ self.index[block.start_lineno] = prev
	+
	+ def search_for_comment(self, lineno, default=None):
	+ """ Find the comment block just before the given line number.
	+
	+ Returns None (or the specified default) if there is no such block.
	+ """
	+ if not self.index:
	+ self.make_index()
	+ block = self.index.get(lineno, None)
	+ text = getattr(block, 'text', default)
	+ return text
	+
	+
	+def strip_comment_marker(text):
	+ """ Strip # markers at the front of a block of comment text.
	+ """
	+ lines = []
	+ for line in text.splitlines():
	+ lines.append(line.lstrip('#'))
	+ text = textwrap.dedent('\n'.join(lines))
	+ return text
	+
	+
	+def get_class_traits(klass):
	+ """ Yield all of the documentation for trait definitions on a class object.
	+ """
	+ # FIXME: gracefully handle errors here or in the caller?
	+ source = inspect.getsource(klass)
	+ cb = CommentBlocker()
	+ cb.process_file(StringIO(source))
	+ mod_ast = compiler.parse(source)
	+ class_ast = mod_ast.node.nodes[0]
	+ for node in class_ast.code.nodes:
	+ # FIXME: handle other kinds of assignments?
	+ if isinstance(node, compiler.ast.Assign):
	+ name = node.nodes[0].name
	+ rhs = unparse(node.expr).strip()
	+ doc = strip_comment_marker(cb.search_for_comment(node.lineno, default=''))
	+ yield name, rhs, doc
	+
	diff --git a/Doc/newdoc/sphinxext/compiler_unparse.py b/Doc/newdoc/sphinxext/compiler_unparse.py
	new file mode 100644
	index 0000000..ffcf51b
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/compiler_unparse.py
	@@ -0,0 +1,860 @@
	+""" Turn compiler.ast structures back into executable python code.
	+
	+ The unparse method takes a compiler.ast tree and transforms it back into
	+ valid python code. It is incomplete and currently only works for
	+ import statements, function calls, function definitions, assignments, and
	+ basic expressions.
	+
	+ Inspired by python-2.5-svn/Demo/parser/unparse.py
	+
	+ fixme: We may want to move to using _ast trees because the compiler for
	+ them is about 6 times faster than compiler.compile.
	+"""
	+
	+import sys
	+import cStringIO
	+from compiler.ast import Const, Name, Tuple, Div, Mul, Sub, Add
	+
	+def unparse(ast, single_line_functions=False):
	+ s = cStringIO.StringIO()
	+ UnparseCompilerAst(ast, s, single_line_functions)
	+ return s.getvalue().lstrip()
	+
	+op_precedence = { 'compiler.ast.Power':3, 'compiler.ast.Mul':2, 'compiler.ast.Div':2,
	+ 'compiler.ast.Add':1, 'compiler.ast.Sub':1 }
	+
	+class UnparseCompilerAst:
	+ """ Methods in this class recursively traverse an AST and
	+ output source code for the abstract syntax; original formatting
	+ is disregarged.
	+ """
	+
	+ #########################################################################
	+ # object interface.
	+ #########################################################################
	+
	+ def __init__(self, tree, file = sys.stdout, single_line_functions=False):
	+ """ Unparser(tree, file=sys.stdout) -> None.
	+
	+ Print the source for tree to file.
	+ """
	+ self.f = file
	+ self._single_func = single_line_functions
	+ self._do_indent = True
	+ self._indent = 0
	+ self._dispatch(tree)
	+ self._write("\n")
	+ self.f.flush()
	+
	+ #########################################################################
	+ # Unparser private interface.
	+ #########################################################################
	+
	+ ### format, output, and dispatch methods ################################
	+
	+ def _fill(self, text = ""):
	+ "Indent a piece of text, according to the current indentation level"
	+ if self._do_indent:
	+ self._write("\n"+" "*self._indent + text)
	+ else:
	+ self._write(text)
	+
	+ def _write(self, text):
	+ "Append a piece of text to the current line."
	+ self.f.write(text)
	+
	+ def _enter(self):
	+ "Print ':', and increase the indentation."
	+ self._write(": ")
	+ self._indent += 1
	+
	+ def _leave(self):
	+ "Decrease the indentation level."
	+ self._indent -= 1
	+
	+ def _dispatch(self, tree):
	+ "_dispatcher function, _dispatching tree type T to method _T."
	+ if isinstance(tree, list):
	+ for t in tree:
	+ self._dispatch(t)
	+ return
	+ meth = getattr(self, "_"+tree.__class__.__name__)
	+ if tree.__class__.__name__ == 'NoneType' and not self._do_indent:
	+ return
	+ meth(tree)
	+
	+
	+ #########################################################################
	+ # compiler.ast unparsing methods.
	+ #
	+ # There should be one method per concrete grammar type. They are
	+ # organized in alphabetical order.
	+ #########################################################################
	+
	+ def _Add(self, t):
	+ self.__binary_op(t, '+')
	+
	+ def _And(self, t):
	+ self._write(" (")
	+ for i, node in enumerate(t.nodes):
	+ self._dispatch(node)
	+ if i != len(t.nodes)-1:
	+ self._write(") and (")
	+ self._write(")")
	+
	+ def _AssAttr(self, t):
	+ """ Handle assigning an attribute of an object
	+ """
	+ self._dispatch(t.expr)
	+ self._write('.'+t.attrname)
	+
	+ def _Assign(self, t):
	+ """ Expression Assignment such as "a = 1".
	+
	+ This only handles assignment in expressions. Keyword assignment
	+ is handled separately.
	+ """
	+ self._fill()
	+ for target in t.nodes:
	+ self._dispatch(target)
	+ self._write(" = ")
	+ self._dispatch(t.expr)
	+ if not self._do_indent:
	+ self._write('; ')
	+
	+ def _AssName(self, t):
	+ """ Name on left hand side of expression.
	+
	+ Treat just like a name on the right side of an expression.
	+ """
	+ self._Name(t)
	+
	+ def _AssTuple(self, t):
	+ """ Tuple on left hand side of an expression.
	+ """
	+
	+ # _write each elements, separated by a comma.
	+ for element in t.nodes[:-1]:
	+ self._dispatch(element)
	+ self._write(", ")
	+
	+ # Handle the last one without writing comma
	+ last_element = t.nodes[-1]
	+ self._dispatch(last_element)
	+
	+ def _AugAssign(self, t):
	+ """ +=,-=,=,/=,*=, etc. operations
	+ """
	+
	+ self._fill()
	+ self._dispatch(t.node)
	+ self._write(' '+t.op+' ')
	+ self._dispatch(t.expr)
	+ if not self._do_indent:
	+ self._write(';')
	+
	+ def _Bitand(self, t):
	+ """ Bit and operation.
	+ """
	+
	+ for i, node in enumerate(t.nodes):
	+ self._write("(")
	+ self._dispatch(node)
	+ self._write(")")
	+ if i != len(t.nodes)-1:
	+ self._write(" & ")
	+
	+ def _Bitor(self, t):
	+ """ Bit or operation
	+ """
	+
	+ for i, node in enumerate(t.nodes):
	+ self._write("(")
	+ self._dispatch(node)
	+ self._write(")")
	+ if i != len(t.nodes)-1:
	+ self._write(" \| ")
	+
	+ def _CallFunc(self, t):
	+ """ Function call.
	+ """
	+ self._dispatch(t.node)
	+ self._write("(")
	+ comma = False
	+ for e in t.args:
	+ if comma: self._write(", ")
	+ else: comma = True
	+ self._dispatch(e)
	+ if t.star_args:
	+ if comma: self._write(", ")
	+ else: comma = True
	+ self._write("*")
	+ self._dispatch(t.star_args)
	+ if t.dstar_args:
	+ if comma: self._write(", ")
	+ else: comma = True
	+ self._write("**")
	+ self._dispatch(t.dstar_args)
	+ self._write(")")
	+
	+ def _Compare(self, t):
	+ self._dispatch(t.expr)
	+ for op, expr in t.ops:
	+ self._write(" " + op + " ")
	+ self._dispatch(expr)
	+
	+ def _Const(self, t):
	+ """ A constant value such as an integer value, 3, or a string, "hello".
	+ """
	+ self._dispatch(t.value)
	+
	+ def _Decorators(self, t):
	+ """ Handle function decorators (eg. @has_units)
	+ """
	+ for node in t.nodes:
	+ self._dispatch(node)
	+
	+ def _Dict(self, t):
	+ self._write("{")
	+ for i, (k, v) in enumerate(t.items):
	+ self._dispatch(k)
	+ self._write(": ")
	+ self._dispatch(v)
	+ if i < len(t.items)-1:
	+ self._write(", ")
	+ self._write("}")
	+
	+ def _Discard(self, t):
	+ """ Node for when return value is ignored such as in "foo(a)".
	+ """
	+ self._fill()
	+ self._dispatch(t.expr)
	+
	+ def _Div(self, t):
	+ self.__binary_op(t, '/')
	+
	+ def _Ellipsis(self, t):
	+ self._write("...")
	+
	+ def _From(self, t):
	+ """ Handle "from xyz import foo, bar as baz".
	+ """
	+ # fixme: Are From and ImportFrom handled differently?
	+ self._fill("from ")
	+ self._write(t.modname)
	+ self._write(" import ")
	+ for i, (name,asname) in enumerate(t.names):
	+ if i != 0:
	+ self._write(", ")
	+ self._write(name)
	+ if asname is not None:
	+ self._write(" as "+asname)
	+
	+ def _Function(self, t):
	+ """ Handle function definitions
	+ """
	+ if t.decorators is not None:
	+ self._fill("@")
	+ self._dispatch(t.decorators)
	+ self._fill("def "+t.name + "(")
	+ defaults = [None] * (len(t.argnames) - len(t.defaults)) + list(t.defaults)
	+ for i, arg in enumerate(zip(t.argnames, defaults)):
	+ self._write(arg[0])
	+ if arg[1] is not None:
	+ self._write('=')
	+ self._dispatch(arg[1])
	+ if i < len(t.argnames)-1:
	+ self._write(', ')
	+ self._write(")")
	+ if self._single_func:
	+ self._do_indent = False
	+ self._enter()
	+ self._dispatch(t.code)
	+ self._leave()
	+ self._do_indent = True
	+
	+ def _Getattr(self, t):
	+ """ Handle getting an attribute of an object
	+ """
	+ if isinstance(t.expr, (Div, Mul, Sub, Add)):
	+ self._write('(')
	+ self._dispatch(t.expr)
	+ self._write(')')
	+ else:
	+ self._dispatch(t.expr)
	+
	+ self._write('.'+t.attrname)
	+
	+ def _If(self, t):
	+ self._fill()
	+
	+ for i, (compare,code) in enumerate(t.tests):
	+ if i == 0:
	+ self._write("if ")
	+ else:
	+ self._write("elif ")
	+ self._dispatch(compare)
	+ self._enter()
	+ self._fill()
	+ self._dispatch(code)
	+ self._leave()
	+ self._write("\n")
	+
	+ if t.else_ is not None:
	+ self._write("else")
	+ self._enter()
	+ self._fill()
	+ self._dispatch(t.else_)
	+ self._leave()
	+ self._write("\n")
	+
	+ def _IfExp(self, t):
	+ self._dispatch(t.then)
	+ self._write(" if ")
	+ self._dispatch(t.test)
	+
	+ if t.else_ is not None:
	+ self._write(" else (")
	+ self._dispatch(t.else_)
	+ self._write(")")
	+
	+ def _Import(self, t):
	+ """ Handle "import xyz.foo".
	+ """
	+ self._fill("import ")
	+
	+ for i, (name,asname) in enumerate(t.names):
	+ if i != 0:
	+ self._write(", ")
	+ self._write(name)
	+ if asname is not None:
	+ self._write(" as "+asname)
	+
	+ def _Keyword(self, t):
	+ """ Keyword value assignment within function calls and definitions.
	+ """
	+ self._write(t.name)
	+ self._write("=")
	+ self._dispatch(t.expr)
	+
	+ def _List(self, t):
	+ self._write("[")
	+ for i,node in enumerate(t.nodes):
	+ self._dispatch(node)
	+ if i < len(t.nodes)-1:
	+ self._write(", ")
	+ self._write("]")
	+
	+ def _Module(self, t):
	+ if t.doc is not None:
	+ self._dispatch(t.doc)
	+ self._dispatch(t.node)
	+
	+ def _Mul(self, t):
	+ self.__binary_op(t, '*')
	+
	+ def _Name(self, t):
	+ self._write(t.name)
	+
	+ def _NoneType(self, t):
	+ self._write("None")
	+
	+ def _Not(self, t):
	+ self._write('not (')
	+ self._dispatch(t.expr)
	+ self._write(')')
	+
	+ def _Or(self, t):
	+ self._write(" (")
	+ for i, node in enumerate(t.nodes):
	+ self._dispatch(node)
	+ if i != len(t.nodes)-1:
	+ self._write(") or (")
	+ self._write(")")
	+
	+ def _Pass(self, t):
	+ self._write("pass\n")
	+
	+ def _Printnl(self, t):
	+ self._fill("print ")
	+ if t.dest:
	+ self._write(">> ")
	+ self._dispatch(t.dest)
	+ self._write(", ")
	+ comma = False
	+ for node in t.nodes:
	+ if comma: self._write(', ')
	+ else: comma = True
	+ self._dispatch(node)
	+
	+ def _Power(self, t):
	+ self.__binary_op(t, '**')
	+
	+ def _Return(self, t):
	+ self._fill("return ")
	+ if t.value:
	+ if isinstance(t.value, Tuple):
	+ text = ', '.join([ name.name for name in t.value.asList() ])
	+ self._write(text)
	+ else:
	+ self._dispatch(t.value)
	+ if not self._do_indent:
	+ self._write('; ')
	+
	+ def _Slice(self, t):
	+ self._dispatch(t.expr)
	+ self._write("[")
	+ if t.lower:
	+ self._dispatch(t.lower)
	+ self._write(":")
	+ if t.upper:
	+ self._dispatch(t.upper)
	+ #if t.step:
	+ # self._write(":")
	+ # self._dispatch(t.step)
	+ self._write("]")
	+
	+ def _Sliceobj(self, t):
	+ for i, node in enumerate(t.nodes):
	+ if i != 0:
	+ self._write(":")
	+ if not (isinstance(node, Const) and node.value is None):
	+ self._dispatch(node)
	+
	+ def _Stmt(self, tree):
	+ for node in tree.nodes:
	+ self._dispatch(node)
	+
	+ def _Sub(self, t):
	+ self.__binary_op(t, '-')
	+
	+ def _Subscript(self, t):
	+ self._dispatch(t.expr)
	+ self._write("[")
	+ for i, value in enumerate(t.subs):
	+ if i != 0:
	+ self._write(",")
	+ self._dispatch(value)
	+ self._write("]")
	+
	+ def _TryExcept(self, t):
	+ self._fill("try")
	+ self._enter()
	+ self._dispatch(t.body)
	+ self._leave()
	+
	+ for handler in t.handlers:
	+ self._fill('except ')
	+ self._dispatch(handler[0])
	+ if handler[1] is not None:
	+ self._write(', ')
	+ self._dispatch(handler[1])
	+ self._enter()
	+ self._dispatch(handler[2])
	+ self._leave()
	+
	+ if t.else_:
	+ self._fill("else")
	+ self._enter()
	+ self._dispatch(t.else_)
	+ self._leave()
	+
	+ def _Tuple(self, t):
	+
	+ if not t.nodes:
	+ # Empty tuple.
	+ self._write("()")
	+ else:
	+ self._write("(")
	+
	+ # _write each elements, separated by a comma.
	+ for element in t.nodes[:-1]:
	+ self._dispatch(element)
	+ self._write(", ")
	+
	+ # Handle the last one without writing comma
	+ last_element = t.nodes[-1]
	+ self._dispatch(last_element)
	+
	+ self._write(")")
	+
	+ def _UnaryAdd(self, t):
	+ self._write("+")
	+ self._dispatch(t.expr)
	+
	+ def _UnarySub(self, t):
	+ self._write("-")
	+ self._dispatch(t.expr)
	+
	+ def _With(self, t):
	+ self._fill('with ')
	+ self._dispatch(t.expr)
	+ if t.vars:
	+ self._write(' as ')
	+ self._dispatch(t.vars.name)
	+ self._enter()
	+ self._dispatch(t.body)
	+ self._leave()
	+ self._write('\n')
	+
	+ def _int(self, t):
	+ self._write(repr(t))
	+
	+ def __binary_op(self, t, symbol):
	+ # Check if parenthesis are needed on left side and then dispatch
	+ has_paren = False
	+ left_class = str(t.left.__class__)
	+ if (left_class in op_precedence.keys() and
	+ op_precedence[left_class] < op_precedence[str(t.__class__)]):
	+ has_paren = True
	+ if has_paren:
	+ self._write('(')
	+ self._dispatch(t.left)
	+ if has_paren:
	+ self._write(')')
	+ # Write the appropriate symbol for operator
	+ self._write(symbol)
	+ # Check if parenthesis are needed on the right side and then dispatch
	+ has_paren = False
	+ right_class = str(t.right.__class__)
	+ if (right_class in op_precedence.keys() and
	+ op_precedence[right_class] < op_precedence[str(t.__class__)]):
	+ has_paren = True
	+ if has_paren:
	+ self._write('(')
	+ self._dispatch(t.right)
	+ if has_paren:
	+ self._write(')')
	+
	+ def _float(self, t):
	+ # if t is 0.1, str(t)->'0.1' while repr(t)->'0.1000000000001'
	+ # We prefer str here.
	+ self._write(str(t))
	+
	+ def _str(self, t):
	+ self._write(repr(t))
	+
	+ def _tuple(self, t):
	+ self._write(str(t))
	+
	+ #########################################################################
	+ # These are the methods from the _ast modules unparse.
	+ #
	+ # As our needs to handle more advanced code increase, we may want to
	+ # modify some of the methods below so that they work for compiler.ast.
	+ #########################################################################
	+
	+# # stmt
	+# def _Expr(self, tree):
	+# self._fill()
	+# self._dispatch(tree.value)
	+#
	+# def _Import(self, t):
	+# self._fill("import ")
	+# first = True
	+# for a in t.names:
	+# if first:
	+# first = False
	+# else:
	+# self._write(", ")
	+# self._write(a.name)
	+# if a.asname:
	+# self._write(" as "+a.asname)
	+#
	+## def _ImportFrom(self, t):
	+## self._fill("from ")
	+## self._write(t.module)
	+## self._write(" import ")
	+## for i, a in enumerate(t.names):
	+## if i == 0:
	+## self._write(", ")
	+## self._write(a.name)
	+## if a.asname:
	+## self._write(" as "+a.asname)
	+## # XXX(jpe) what is level for?
	+##
	+#
	+# def _Break(self, t):
	+# self._fill("break")
	+#
	+# def _Continue(self, t):
	+# self._fill("continue")
	+#
	+# def _Delete(self, t):
	+# self._fill("del ")
	+# self._dispatch(t.targets)
	+#
	+# def _Assert(self, t):
	+# self._fill("assert ")
	+# self._dispatch(t.test)
	+# if t.msg:
	+# self._write(", ")
	+# self._dispatch(t.msg)
	+#
	+# def _Exec(self, t):
	+# self._fill("exec ")
	+# self._dispatch(t.body)
	+# if t.globals:
	+# self._write(" in ")
	+# self._dispatch(t.globals)
	+# if t.locals:
	+# self._write(", ")
	+# self._dispatch(t.locals)
	+#
	+# def _Print(self, t):
	+# self._fill("print ")
	+# do_comma = False
	+# if t.dest:
	+# self._write(">>")
	+# self._dispatch(t.dest)
	+# do_comma = True
	+# for e in t.values:
	+# if do_comma:self._write(", ")
	+# else:do_comma=True
	+# self._dispatch(e)
	+# if not t.nl:
	+# self._write(",")
	+#
	+# def _Global(self, t):
	+# self._fill("global")
	+# for i, n in enumerate(t.names):
	+# if i != 0:
	+# self._write(",")
	+# self._write(" " + n)
	+#
	+# def _Yield(self, t):
	+# self._fill("yield")
	+# if t.value:
	+# self._write(" (")
	+# self._dispatch(t.value)
	+# self._write(")")
	+#
	+# def _Raise(self, t):
	+# self._fill('raise ')
	+# if t.type:
	+# self._dispatch(t.type)
	+# if t.inst:
	+# self._write(", ")
	+# self._dispatch(t.inst)
	+# if t.tback:
	+# self._write(", ")
	+# self._dispatch(t.tback)
	+#
	+#
	+# def _TryFinally(self, t):
	+# self._fill("try")
	+# self._enter()
	+# self._dispatch(t.body)
	+# self._leave()
	+#
	+# self._fill("finally")
	+# self._enter()
	+# self._dispatch(t.finalbody)
	+# self._leave()
	+#
	+# def _excepthandler(self, t):
	+# self._fill("except ")
	+# if t.type:
	+# self._dispatch(t.type)
	+# if t.name:
	+# self._write(", ")
	+# self._dispatch(t.name)
	+# self._enter()
	+# self._dispatch(t.body)
	+# self._leave()
	+#
	+# def _ClassDef(self, t):
	+# self._write("\n")
	+# self._fill("class "+t.name)
	+# if t.bases:
	+# self._write("(")
	+# for a in t.bases:
	+# self._dispatch(a)
	+# self._write(", ")
	+# self._write(")")
	+# self._enter()
	+# self._dispatch(t.body)
	+# self._leave()
	+#
	+# def _FunctionDef(self, t):
	+# self._write("\n")
	+# for deco in t.decorators:
	+# self._fill("@")
	+# self._dispatch(deco)
	+# self._fill("def "+t.name + "(")
	+# self._dispatch(t.args)
	+# self._write(")")
	+# self._enter()
	+# self._dispatch(t.body)
	+# self._leave()
	+#
	+# def _For(self, t):
	+# self._fill("for ")
	+# self._dispatch(t.target)
	+# self._write(" in ")
	+# self._dispatch(t.iter)
	+# self._enter()
	+# self._dispatch(t.body)
	+# self._leave()
	+# if t.orelse:
	+# self._fill("else")
	+# self._enter()
	+# self._dispatch(t.orelse)
	+# self._leave
	+#
	+# def _While(self, t):
	+# self._fill("while ")
	+# self._dispatch(t.test)
	+# self._enter()
	+# self._dispatch(t.body)
	+# self._leave()
	+# if t.orelse:
	+# self._fill("else")
	+# self._enter()
	+# self._dispatch(t.orelse)
	+# self._leave
	+#
	+# # expr
	+# def _Str(self, tree):
	+# self._write(repr(tree.s))
	+##
	+# def _Repr(self, t):
	+# self._write("`")
	+# self._dispatch(t.value)
	+# self._write("`")
	+#
	+# def _Num(self, t):
	+# self._write(repr(t.n))
	+#
	+# def _ListComp(self, t):
	+# self._write("[")
	+# self._dispatch(t.elt)
	+# for gen in t.generators:
	+# self._dispatch(gen)
	+# self._write("]")
	+#
	+# def _GeneratorExp(self, t):
	+# self._write("(")
	+# self._dispatch(t.elt)
	+# for gen in t.generators:
	+# self._dispatch(gen)
	+# self._write(")")
	+#
	+# def _comprehension(self, t):
	+# self._write(" for ")
	+# self._dispatch(t.target)
	+# self._write(" in ")
	+# self._dispatch(t.iter)
	+# for if_clause in t.ifs:
	+# self._write(" if ")
	+# self._dispatch(if_clause)
	+#
	+# def _IfExp(self, t):
	+# self._dispatch(t.body)
	+# self._write(" if ")
	+# self._dispatch(t.test)
	+# if t.orelse:
	+# self._write(" else ")
	+# self._dispatch(t.orelse)
	+#
	+# unop = {"Invert":"~", "Not": "not", "UAdd":"+", "USub":"-"}
	+# def _UnaryOp(self, t):
	+# self._write(self.unop[t.op.__class__.__name__])
	+# self._write("(")
	+# self._dispatch(t.operand)
	+# self._write(")")
	+#
	+# binop = { "Add":"+", "Sub":"-", "Mult":"*", "Div":"/", "Mod":"%",
	+# "LShift":">>", "RShift":"<<", "BitOr":"\|", "BitXor":"^", "BitAnd":"&",
	+# "FloorDiv":"//", "Pow": "**"}
	+# def _BinOp(self, t):
	+# self._write("(")
	+# self._dispatch(t.left)
	+# self._write(")" + self.binop[t.op.__class__.__name__] + "(")
	+# self._dispatch(t.right)
	+# self._write(")")
	+#
	+# boolops = {_ast.And: 'and', _ast.Or: 'or'}
	+# def _BoolOp(self, t):
	+# self._write("(")
	+# self._dispatch(t.values[0])
	+# for v in t.values[1:]:
	+# self._write(" %s " % self.boolops[t.op.__class__])
	+# self._dispatch(v)
	+# self._write(")")
	+#
	+# def _Attribute(self,t):
	+# self._dispatch(t.value)
	+# self._write(".")
	+# self._write(t.attr)
	+#
	+## def _Call(self, t):
	+## self._dispatch(t.func)
	+## self._write("(")
	+## comma = False
	+## for e in t.args:
	+## if comma: self._write(", ")
	+## else: comma = True
	+## self._dispatch(e)
	+## for e in t.keywords:
	+## if comma: self._write(", ")
	+## else: comma = True
	+## self._dispatch(e)
	+## if t.starargs:
	+## if comma: self._write(", ")
	+## else: comma = True
	+## self._write("*")
	+## self._dispatch(t.starargs)
	+## if t.kwargs:
	+## if comma: self._write(", ")
	+## else: comma = True
	+## self._write("**")
	+## self._dispatch(t.kwargs)
	+## self._write(")")
	+#
	+# # slice
	+# def _Index(self, t):
	+# self._dispatch(t.value)
	+#
	+# def _ExtSlice(self, t):
	+# for i, d in enumerate(t.dims):
	+# if i != 0:
	+# self._write(': ')
	+# self._dispatch(d)
	+#
	+# # others
	+# def _arguments(self, t):
	+# first = True
	+# nonDef = len(t.args)-len(t.defaults)
	+# for a in t.args[0:nonDef]:
	+# if first:first = False
	+# else: self._write(", ")
	+# self._dispatch(a)
	+# for a,d in zip(t.args[nonDef:], t.defaults):
	+# if first:first = False
	+# else: self._write(", ")
	+# self._dispatch(a),
	+# self._write("=")
	+# self._dispatch(d)
	+# if t.vararg:
	+# if first:first = False
	+# else: self._write(", ")
	+# self._write("*"+t.vararg)
	+# if t.kwarg:
	+# if first:first = False
	+# else: self._write(", ")
	+# self._write("**"+t.kwarg)
	+#
	+## def _keyword(self, t):
	+## self._write(t.arg)
	+## self._write("=")
	+## self._dispatch(t.value)
	+#
	+# def _Lambda(self, t):
	+# self._write("lambda ")
	+# self._dispatch(t.args)
	+# self._write(": ")
	+# self._dispatch(t.body)
	+
	+
	+
	diff --git a/Doc/newdoc/sphinxext/docscrape.py b/Doc/newdoc/sphinxext/docscrape.py
	new file mode 100644
	index 0000000..615ea11
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/docscrape.py
	@@ -0,0 +1,500 @@
	+"""Extract reference documentation from the NumPy source tree.
	+
	+"""
	+
	+import inspect
	+import textwrap
	+import re
	+import pydoc
	+from StringIO import StringIO
	+from warnings import warn
	+
	+class Reader(object):
	+ """A line-based string reader.
	+
	+ """
	+ def __init__(self, data):
	+ """
	+ Parameters
	+ ----------
	+ data : str
	+ String with lines separated by '\n'.
	+
	+ """
	+ if isinstance(data,list):
	+ self._str = data
	+ else:
	+ self._str = data.split('\n') # store string as list of lines
	+
	+ self.reset()
	+
	+ def __getitem__(self, n):
	+ return self._str[n]
	+
	+ def reset(self):
	+ self._l = 0 # current line nr
	+
	+ def read(self):
	+ if not self.eof():
	+ out = self[self._l]
	+ self._l += 1
	+ return out
	+ else:
	+ return ''
	+
	+ def seek_next_non_empty_line(self):
	+ for l in self[self._l:]:
	+ if l.strip():
	+ break
	+ else:
	+ self._l += 1
	+
	+ def eof(self):
	+ return self._l >= len(self._str)
	+
	+ def read_to_condition(self, condition_func):
	+ start = self._l
	+ for line in self[start:]:
	+ if condition_func(line):
	+ return self[start:self._l]
	+ self._l += 1
	+ if self.eof():
	+ return self[start:self._l+1]
	+ return []
	+
	+ def read_to_next_empty_line(self):
	+ self.seek_next_non_empty_line()
	+ def is_empty(line):
	+ return not line.strip()
	+ return self.read_to_condition(is_empty)
	+
	+ def read_to_next_unindented_line(self):
	+ def is_unindented(line):
	+ return (line.strip() and (len(line.lstrip()) == len(line)))
	+ return self.read_to_condition(is_unindented)
	+
	+ def peek(self,n=0):
	+ if self._l + n < len(self._str):
	+ return self[self._l + n]
	+ else:
	+ return ''
	+
	+ def is_empty(self):
	+ return not ''.join(self._str).strip()
	+
	+
	+class NumpyDocString(object):
	+ def __init__(self, docstring, config={}):
	+ docstring = textwrap.dedent(docstring).split('\n')
	+
	+ self._doc = Reader(docstring)
	+ self._parsed_data = {
	+ 'Signature': '',
	+ 'Summary': [''],
	+ 'Extended Summary': [],
	+ 'Parameters': [],
	+ 'Returns': [],
	+ 'Raises': [],
	+ 'Warns': [],
	+ 'Other Parameters': [],
	+ 'Attributes': [],
	+ 'Methods': [],
	+ 'See Also': [],
	+ 'Notes': [],
	+ 'Warnings': [],
	+ 'References': '',
	+ 'Examples': '',
	+ 'index': {}
	+ }
	+
	+ self._parse()
	+
	+ def __getitem__(self,key):
	+ return self._parsed_data[key]
	+
	+ def __setitem__(self,key,val):
	+ if not self._parsed_data.has_key(key):
	+ warn("Unknown section %s" % key)
	+ else:
	+ self._parsed_data[key] = val
	+
	+ def _is_at_section(self):
	+ self._doc.seek_next_non_empty_line()
	+
	+ if self._doc.eof():
	+ return False
	+
	+ l1 = self._doc.peek().strip() # e.g. Parameters
	+
	+ if l1.startswith('.. index::'):
	+ return True
	+
	+ l2 = self._doc.peek(1).strip() # ---------- or ==========
	+ return l2.startswith('-'len(l1)) or l2.startswith('='len(l1))
	+
	+ def _strip(self,doc):
	+ i = 0
	+ j = 0
	+ for i,line in enumerate(doc):
	+ if line.strip(): break
	+
	+ for j,line in enumerate(doc[::-1]):
	+ if line.strip(): break
	+
	+ return doc[i:len(doc)-j]
	+
	+ def _read_to_next_section(self):
	+ section = self._doc.read_to_next_empty_line()
	+
	+ while not self._is_at_section() and not self._doc.eof():
	+ if not self._doc.peek(-1).strip(): # previous line was empty
	+ section += ['']
	+
	+ section += self._doc.read_to_next_empty_line()
	+
	+ return section
	+
	+ def _read_sections(self):
	+ while not self._doc.eof():
	+ data = self._read_to_next_section()
	+ name = data[0].strip()
	+
	+ if name.startswith('..'): # index section
	+ yield name, data[1:]
	+ elif len(data) < 2:
	+ yield StopIteration
	+ else:
	+ yield name, self._strip(data[2:])
	+
	+ def _parse_param_list(self,content):
	+ r = Reader(content)
	+ params = []
	+ while not r.eof():
	+ header = r.read().strip()
	+ if ' : ' in header:
	+ arg_name, arg_type = header.split(' : ')[:2]
	+ else:
	+ arg_name, arg_type = header, ''
	+
	+ desc = r.read_to_next_unindented_line()
	+ desc = dedent_lines(desc)
	+
	+ params.append((arg_name,arg_type,desc))
	+
	+ return params
	+
	+
	+ _name_rgx = re.compile(r"^\s*(:(?P<role>\w+):`(?P<name>[a-zA-Z0-9_.-]+)`\|"
	+ r" (?P<name2>[a-zA-Z0-9_.-]+))\s*", re.X)
	+ def _parse_see_also(self, content):
	+ """
	+ func_name : Descriptive text
	+ continued text
	+ another_func_name : Descriptive text
	+ func_name1, func_name2, :meth:`func_name`, func_name3
	+
	+ """
	+ items = []
	+
	+ def parse_item_name(text):
	+ """Match ':role:`name`' or 'name'"""
	+ m = self._name_rgx.match(text)
	+ if m:
	+ g = m.groups()
	+ if g[1] is None:
	+ return g[3], None
	+ else:
	+ return g[2], g[1]
	+ raise ValueError("%s is not a item name" % text)
	+
	+ def push_item(name, rest):
	+ if not name:
	+ return
	+ name, role = parse_item_name(name)
	+ items.append((name, list(rest), role))
	+ del rest[:]
	+
	+ current_func = None
	+ rest = []
	+
	+ for line in content:
	+ if not line.strip(): continue
	+
	+ m = self._name_rgx.match(line)
	+ if m and line[m.end():].strip().startswith(':'):
	+ push_item(current_func, rest)
	+ current_func, line = line[:m.end()], line[m.end():]
	+ rest = [line.split(':', 1)[1].strip()]
	+ if not rest[0]:
	+ rest = []
	+ elif not line.startswith(' '):
	+ push_item(current_func, rest)
	+ current_func = None
	+ if ',' in line:
	+ for func in line.split(','):
	+ if func.strip():
	+ push_item(func, [])
	+ elif line.strip():
	+ current_func = line
	+ elif current_func is not None:
	+ rest.append(line.strip())
	+ push_item(current_func, rest)
	+ return items
	+
	+ def _parse_index(self, section, content):
	+ """
	+ .. index: default
	+ :refguide: something, else, and more
	+
	+ """
	+ def strip_each_in(lst):
	+ return [s.strip() for s in lst]
	+
	+ out = {}
	+ section = section.split('::')
	+ if len(section) > 1:
	+ out['default'] = strip_each_in(section[1].split(','))[0]
	+ for line in content:
	+ line = line.split(':')
	+ if len(line) > 2:
	+ out[line[1]] = strip_each_in(line[2].split(','))
	+ return out
	+
	+ def _parse_summary(self):
	+ """Grab signature (if given) and summary"""
	+ if self._is_at_section():
	+ return
	+
	+ summary = self._doc.read_to_next_empty_line()
	+ summary_str = " ".join([s.strip() for s in summary]).strip()
	+ if re.compile('^([\w., ]+=)?\s[\w\.]+$.$$').match(summary_str):
	+ self['Signature'] = summary_str
	+ if not self._is_at_section():
	+ self['Summary'] = self._doc.read_to_next_empty_line()
	+ else:
	+ self['Summary'] = summary
	+
	+ if not self._is_at_section():
	+ self['Extended Summary'] = self._read_to_next_section()
	+
	+ def _parse(self):
	+ self._doc.reset()
	+ self._parse_summary()
	+
	+ for (section,content) in self._read_sections():
	+ if not section.startswith('..'):
	+ section = ' '.join([s.capitalize() for s in section.split(' ')])
	+ if section in ('Parameters', 'Returns', 'Raises', 'Warns',
	+ 'Other Parameters', 'Attributes', 'Methods'):
	+ self[section] = self._parse_param_list(content)
	+ elif section.startswith('.. index::'):
	+ self['index'] = self._parse_index(section, content)
	+ elif section == 'See Also':
	+ self['See Also'] = self._parse_see_also(content)
	+ else:
	+ self[section] = content
	+
	+ # string conversion routines
	+
	+ def _str_header(self, name, symbol='-'):
	+ return [name, len(name)*symbol]
	+
	+ def _str_indent(self, doc, indent=4):
	+ out = []
	+ for line in doc:
	+ out += [' '*indent + line]
	+ return out
	+
	+ def _str_signature(self):
	+ if self['Signature']:
	+ return [self['Signature'].replace('','\')] + ['']
	+ else:
	+ return ['']
	+
	+ def _str_summary(self):
	+ if self['Summary']:
	+ return self['Summary'] + ['']
	+ else:
	+ return []
	+
	+ def _str_extended_summary(self):
	+ if self['Extended Summary']:
	+ return self['Extended Summary'] + ['']
	+ else:
	+ return []
	+
	+ def _str_param_list(self, name):
	+ out = []
	+ if self[name]:
	+ out += self._str_header(name)
	+ for param,param_type,desc in self[name]:
	+ out += ['%s : %s' % (param, param_type)]
	+ out += self._str_indent(desc)
	+ out += ['']
	+ return out
	+
	+ def _str_section(self, name):
	+ out = []
	+ if self[name]:
	+ out += self._str_header(name)
	+ out += self[name]
	+ out += ['']
	+ return out
	+
	+ def _str_see_also(self, func_role):
	+ if not self['See Also']: return []
	+ out = []
	+ out += self._str_header("See Also")
	+ last_had_desc = True
	+ for func, desc, role in self['See Also']:
	+ if role:
	+ link = ':%s:`%s`' % (role, func)
	+ elif func_role:
	+ link = ':%s:`%s`' % (func_role, func)
	+ else:
	+ link = "`%s`_" % func
	+ if desc or last_had_desc:
	+ out += ['']
	+ out += [link]
	+ else:
	+ out[-1] += ", %s" % link
	+ if desc:
	+ out += self._str_indent([' '.join(desc)])
	+ last_had_desc = True
	+ else:
	+ last_had_desc = False
	+ out += ['']
	+ return out
	+
	+ def _str_index(self):
	+ idx = self['index']
	+ out = []
	+ out += ['.. index:: %s' % idx.get('default','')]
	+ for section, references in idx.iteritems():
	+ if section == 'default':
	+ continue
	+ out += [' :%s: %s' % (section, ', '.join(references))]
	+ return out
	+
	+ def __str__(self, func_role=''):
	+ out = []
	+ out += self._str_signature()
	+ out += self._str_summary()
	+ out += self._str_extended_summary()
	+ for param_list in ('Parameters', 'Returns', 'Other Parameters',
	+ 'Raises', 'Warns'):
	+ out += self._str_param_list(param_list)
	+ out += self._str_section('Warnings')
	+ out += self._str_see_also(func_role)
	+ for s in ('Notes','References','Examples'):
	+ out += self._str_section(s)
	+ for param_list in ('Attributes', 'Methods'):
	+ out += self._str_param_list(param_list)
	+ out += self._str_index()
	+ return '\n'.join(out)
	+
	+
	+def indent(str,indent=4):
	+ indent_str = ' '*indent
	+ if str is None:
	+ return indent_str
	+ lines = str.split('\n')
	+ return '\n'.join(indent_str + l for l in lines)
	+
	+def dedent_lines(lines):
	+ """Deindent a list of lines maximally"""
	+ return textwrap.dedent("\n".join(lines)).split("\n")
	+
	+def header(text, style='-'):
	+ return text + '\n' + style*len(text) + '\n'
	+
	+
	+class FunctionDoc(NumpyDocString):
	+ def __init__(self, func, role='func', doc=None, config={}):
	+ self._f = func
	+ self._role = role # e.g. "func" or "meth"
	+
	+ if doc is None:
	+ if func is None:
	+ raise ValueError("No function or docstring given")
	+ doc = inspect.getdoc(func) or ''
	+ NumpyDocString.__init__(self, doc)
	+
	+ if not self['Signature'] and func is not None:
	+ func, func_name = self.get_func()
	+ try:
	+ # try to read signature
	+ argspec = inspect.getargspec(func)
	+ argspec = inspect.formatargspec(*argspec)
	+ argspec = argspec.replace('','\')
	+ signature = '%s%s' % (func_name, argspec)
	+ except TypeError, e:
	+ signature = '%s()' % func_name
	+ self['Signature'] = signature
	+
	+ def get_func(self):
	+ func_name = getattr(self._f, '__name__', self.__class__.__name__)
	+ if inspect.isclass(self._f):
	+ func = getattr(self._f, '__call__', self._f.__init__)
	+ else:
	+ func = self._f
	+ return func, func_name
	+
	+ def __str__(self):
	+ out = ''
	+
	+ func, func_name = self.get_func()
	+ signature = self['Signature'].replace('', '\')
	+
	+ roles = {'func': 'function',
	+ 'meth': 'method'}
	+
	+ if self._role:
	+ if not roles.has_key(self._role):
	+ print "Warning: invalid role %s" % self._role
	+ out += '.. %s:: %s\n \n\n' % (roles.get(self._role,''),
	+ func_name)
	+
	+ out += super(FunctionDoc, self).__str__(func_role=self._role)
	+ return out
	+
	+
	+class ClassDoc(NumpyDocString):
	+ def __init__(self, cls, doc=None, modulename='', func_doc=FunctionDoc,
	+ config={}):
	+ if not inspect.isclass(cls) and cls is not None:
	+ raise ValueError("Expected a class or None, but got %r" % cls)
	+ self._cls = cls
	+
	+ if modulename and not modulename.endswith('.'):
	+ modulename += '.'
	+ self._mod = modulename
	+
	+ if doc is None:
	+ if cls is None:
	+ raise ValueError("No class or documentation string given")
	+ doc = pydoc.getdoc(cls)
	+
	+ NumpyDocString.__init__(self, doc)
	+
	+ if config.get('show_class_members', True):
	+ if not self['Methods']:
	+ self['Methods'] = [(name, '', '')
	+ for name in sorted(self.methods)]
	+ if not self['Attributes']:
	+ self['Attributes'] = [(name, '', '')
	+ for name in sorted(self.properties)]
	+
	+ @property
	+ def methods(self):
	+ if self._cls is None:
	+ return []
	+ return [name for name,func in inspect.getmembers(self._cls)
	+ if not name.startswith('_') and callable(func)]
	+
	+ @property
	+ def properties(self):
	+ if self._cls is None:
	+ return []
	+ return [name for name,func in inspect.getmembers(self._cls)
	+ if not name.startswith('_') and func is None]
	diff --git a/Doc/newdoc/sphinxext/docscrape.pyc b/Doc/newdoc/sphinxext/docscrape.pyc
	new file mode 100644
	index 0000000..0456e9f
	Binary files /dev/null and b/Doc/newdoc/sphinxext/docscrape.pyc differ
	diff --git a/Doc/newdoc/sphinxext/docscrape_sphinx.py b/Doc/newdoc/sphinxext/docscrape_sphinx.py
	new file mode 100644
	index 0000000..e44e770
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/docscrape_sphinx.py
	@@ -0,0 +1,227 @@
	+import re, inspect, textwrap, pydoc
	+import sphinx
	+from docscrape import NumpyDocString, FunctionDoc, ClassDoc
	+
	+class SphinxDocString(NumpyDocString):
	+ def __init__(self, docstring, config={}):
	+ self.use_plots = config.get('use_plots', False)
	+ NumpyDocString.__init__(self, docstring, config=config)
	+
	+ # string conversion routines
	+ def _str_header(self, name, symbol='`'):
	+ return ['.. rubric:: ' + name, '']
	+
	+ def _str_field_list(self, name):
	+ return [':' + name + ':']
	+
	+ def _str_indent(self, doc, indent=4):
	+ out = []
	+ for line in doc:
	+ out += [' '*indent + line]
	+ return out
	+
	+ def _str_signature(self):
	+ return ['']
	+ if self['Signature']:
	+ return ['``%s``' % self['Signature']] + ['']
	+ else:
	+ return ['']
	+
	+ def _str_summary(self):
	+ return self['Summary'] + ['']
	+
	+ def _str_extended_summary(self):
	+ return self['Extended Summary'] + ['']
	+
	+ def _str_param_list(self, name):
	+ out = []
	+ if self[name]:
	+ out += self._str_field_list(name)
	+ out += ['']
	+ for param,param_type,desc in self[name]:
	+ out += self._str_indent(['%s : %s' % (param.strip(),
	+ param_type)])
	+ out += ['']
	+ out += self._str_indent(desc,8)
	+ out += ['']
	+ return out
	+
	+ @property
	+ def _obj(self):
	+ if hasattr(self, '_cls'):
	+ return self._cls
	+ elif hasattr(self, '_f'):
	+ return self._f
	+ return None
	+
	+ def _str_member_list(self, name):
	+ """
	+ Generate a member listing, autosummary:: table where possible,
	+ and a table where not.
	+
	+ """
	+ out = []
	+ if self[name]:
	+ out += ['.. rubric:: %s' % name, '']
	+ prefix = getattr(self, '_name', '')
	+
	+ if prefix:
	+ prefix = '~%s.' % prefix
	+
	+ autosum = []
	+ others = []
	+ for param, param_type, desc in self[name]:
	+ param = param.strip()
	+ if not self._obj or hasattr(self._obj, param):
	+ autosum += [" %s%s" % (prefix, param)]
	+ else:
	+ others.append((param, param_type, desc))
	+
	+ if autosum:
	+ out += ['.. autosummary::', ' :toctree:', '']
	+ out += autosum
	+
	+ if others:
	+ maxlen_0 = max([len(x[0]) for x in others])
	+ maxlen_1 = max([len(x[1]) for x in others])
	+ hdr = "="maxlen_0 + " " + "="maxlen_1 + " " + "="*10
	+ fmt = '%%%ds %%%ds ' % (maxlen_0, maxlen_1)
	+ n_indent = maxlen_0 + maxlen_1 + 4
	+ out += [hdr]
	+ for param, param_type, desc in others:
	+ out += [fmt % (param.strip(), param_type)]
	+ out += self._str_indent(desc, n_indent)
	+ out += [hdr]
	+ out += ['']
	+ return out
	+
	+ def _str_section(self, name):
	+ out = []
	+ if self[name]:
	+ out += self._str_header(name)
	+ out += ['']
	+ content = textwrap.dedent("\n".join(self[name])).split("\n")
	+ out += content
	+ out += ['']
	+ return out
	+
	+ def _str_see_also(self, func_role):
	+ out = []
	+ if self['See Also']:
	+ see_also = super(SphinxDocString, self)._str_see_also(func_role)
	+ out = ['.. seealso::', '']
	+ out += self._str_indent(see_also[2:])
	+ return out
	+
	+ def _str_warnings(self):
	+ out = []
	+ if self['Warnings']:
	+ out = ['.. warning::', '']
	+ out += self._str_indent(self['Warnings'])
	+ return out
	+
	+ def _str_index(self):
	+ idx = self['index']
	+ out = []
	+ if len(idx) == 0:
	+ return out
	+
	+ out += ['.. index:: %s' % idx.get('default','')]
	+ for section, references in idx.iteritems():
	+ if section == 'default':
	+ continue
	+ elif section == 'refguide':
	+ out += [' single: %s' % (', '.join(references))]
	+ else:
	+ out += [' %s: %s' % (section, ','.join(references))]
	+ return out
	+
	+ def _str_references(self):
	+ out = []
	+ if self['References']:
	+ out += self._str_header('References')
	+ if isinstance(self['References'], str):
	+ self['References'] = [self['References']]
	+ out.extend(self['References'])
	+ out += ['']
	+ # Latex collects all references to a separate bibliography,
	+ # so we need to insert links to it
	+ if sphinx.__version__ >= "0.6":
	+ out += ['.. only:: latex','']
	+ else:
	+ out += ['.. latexonly::','']
	+ items = []
	+ for line in self['References']:
	+ m = re.match(r'.. \[([a-z0-9._-]+)\]', line, re.I)
	+ if m:
	+ items.append(m.group(1))
	+ out += [' ' + ", ".join(["[%s]_" % item for item in items]), '']
	+ return out
	+
	+ def _str_examples(self):
	+ examples_str = "\n".join(self['Examples'])
	+
	+ if (self.use_plots and 'import matplotlib' in examples_str
	+ and 'plot::' not in examples_str):
	+ out = []
	+ out += self._str_header('Examples')
	+ out += ['.. plot::', '']
	+ out += self._str_indent(self['Examples'])
	+ out += ['']
	+ return out
	+ else:
	+ return self._str_section('Examples')
	+
	+ def __str__(self, indent=0, func_role="obj"):
	+ out = []
	+ out += self._str_signature()
	+ out += self._str_index() + ['']
	+ out += self._str_summary()
	+ out += self._str_extended_summary()
	+ for param_list in ('Parameters', 'Returns', 'Other Parameters',
	+ 'Raises', 'Warns'):
	+ out += self._str_param_list(param_list)
	+ out += self._str_warnings()
	+ out += self._str_see_also(func_role)
	+ out += self._str_section('Notes')
	+ out += self._str_references()
	+ out += self._str_examples()
	+ for param_list in ('Attributes', 'Methods'):
	+ out += self._str_member_list(param_list)
	+ out = self._str_indent(out,indent)
	+ return '\n'.join(out)
	+
	+class SphinxFunctionDoc(SphinxDocString, FunctionDoc):
	+ def __init__(self, obj, doc=None, config={}):
	+ self.use_plots = config.get('use_plots', False)
	+ FunctionDoc.__init__(self, obj, doc=doc, config=config)
	+
	+class SphinxClassDoc(SphinxDocString, ClassDoc):
	+ def __init__(self, obj, doc=None, func_doc=None, config={}):
	+ self.use_plots = config.get('use_plots', False)
	+ ClassDoc.__init__(self, obj, doc=doc, func_doc=None, config=config)
	+
	+class SphinxObjDoc(SphinxDocString):
	+ def __init__(self, obj, doc=None, config={}):
	+ self._f = obj
	+ SphinxDocString.__init__(self, doc, config=config)
	+
	+def get_doc_object(obj, what=None, doc=None, config={}):
	+ if what is None:
	+ if inspect.isclass(obj):
	+ what = 'class'
	+ elif inspect.ismodule(obj):
	+ what = 'module'
	+ elif callable(obj):
	+ what = 'function'
	+ else:
	+ what = 'object'
	+ if what == 'class':
	+ return SphinxClassDoc(obj, func_doc=SphinxFunctionDoc, doc=doc,
	+ config=config)
	+ elif what in ('function', 'method'):
	+ return SphinxFunctionDoc(obj, doc=doc, config=config)
	+ else:
	+ if doc is None:
	+ doc = pydoc.getdoc(obj)
	+ return SphinxObjDoc(obj, doc, config=config)
	diff --git a/Doc/newdoc/sphinxext/docscrape_sphinx.pyc b/Doc/newdoc/sphinxext/docscrape_sphinx.pyc
	new file mode 100644
	index 0000000..f0bf77b
	Binary files /dev/null and b/Doc/newdoc/sphinxext/docscrape_sphinx.pyc differ
	diff --git a/Doc/newdoc/sphinxext/numpydoc.py b/Doc/newdoc/sphinxext/numpydoc.py
	new file mode 100644
	index 0000000..43c6733
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/numpydoc.py
	@@ -0,0 +1,169 @@
	+"""
	+========
	+numpydoc
	+========
	+
	+Sphinx extension that handles docstrings in the Numpy standard format. [1]
	+
	+It will:
	+
	+- Convert Parameters etc. sections to field lists.
	+- Convert See Also section to a See also entry.
	+- Renumber references.
	+- Extract the signature from the docstring, if it can't be determined otherwise.
	+
	+.. [1] http://projects.scipy.org/numpy/wiki/CodingStyleGuidelines#docstring-standard
	+
	+"""
	+
	+import sphinx
	+
	+if sphinx.__version__ < '1.0.1':
	+ raise RuntimeError("Sphinx 1.0.1 or newer is required")
	+
	+import os, re, pydoc
	+from docscrape_sphinx import get_doc_object, SphinxDocString
	+from sphinx.util.compat import Directive
	+import inspect
	+
	+def mangle_docstrings(app, what, name, obj, options, lines,
	+ reference_offset=[0]):
	+
	+ cfg = dict(use_plots=app.config.numpydoc_use_plots,
	+ show_class_members=app.config.numpydoc_show_class_members)
	+
	+ if what == 'module':
	+ # Strip top title
	+ title_re = re.compile(ur'^\s[#=]{4,}\n[a-z0-9 -]+\n[#=]{4,}\s',
	+ re.I\|re.S)
	+ lines[:] = title_re.sub(u'', u"\n".join(lines)).split(u"\n")
	+ else:
	+ doc = get_doc_object(obj, what, u"\n".join(lines), config=cfg)
	+ lines[:] = unicode(doc).split(u"\n")
	+
	+ if app.config.numpydoc_edit_link and hasattr(obj, '__name__') and \
	+ obj.__name__:
	+ if hasattr(obj, '__module__'):
	+ v = dict(full_name=u"%s.%s" % (obj.__module__, obj.__name__))
	+ else:
	+ v = dict(full_name=obj.__name__)
	+ lines += [u'', u'.. htmlonly::', '']
	+ lines += [u' %s' % x for x in
	+ (app.config.numpydoc_edit_link % v).split("\n")]
	+
	+ # replace reference numbers so that there are no duplicates
	+ references = []
	+ for line in lines:
	+ line = line.strip()
	+ m = re.match(ur'^.. \[([a-z0-9_.-])\]', line, re.I)
	+ if m:
	+ references.append(m.group(1))
	+
	+ # start renaming from the longest string, to avoid overwriting parts
	+ references.sort(key=lambda x: -len(x))
	+ if references:
	+ for i, line in enumerate(lines):
	+ for r in references:
	+ if re.match(ur'^\d+$', r):
	+ new_r = u"R%d" % (reference_offset[0] + int(r))
	+ else:
	+ new_r = u"%s%d" % (r, reference_offset[0])
	+ lines[i] = lines[i].replace(u'[%s]_' % r,
	+ u'[%s]_' % new_r)
	+ lines[i] = lines[i].replace(u'.. [%s]' % r,
	+ u'.. [%s]' % new_r)
	+
	+ reference_offset[0] += len(references)
	+
	+def mangle_signature(app, what, name, obj, options, sig, retann):
	+ # Do not try to inspect classes that don't define `__init__`
	+ if (inspect.isclass(obj) and
	+ (not hasattr(obj, '__init__') or
	+ 'initializes x; see ' in pydoc.getdoc(obj.__init__))):
	+ return '', ''
	+
	+ if not (callable(obj) or hasattr(obj, '__argspec_is_invalid_')): return
	+ if not hasattr(obj, '__doc__'): return
	+
	+ doc = SphinxDocString(pydoc.getdoc(obj))
	+ if doc['Signature']:
	+ sig = re.sub(u"^[^(]*", u"", doc['Signature'])
	+ return sig, u''
	+
	+def setup(app, get_doc_object_=get_doc_object):
	+ global get_doc_object
	+ get_doc_object = get_doc_object_
	+
	+ app.connect('autodoc-process-docstring', mangle_docstrings)
	+ app.connect('autodoc-process-signature', mangle_signature)
	+ app.add_config_value('numpydoc_edit_link', None, False)
	+ app.add_config_value('numpydoc_use_plots', None, False)
	+ app.add_config_value('numpydoc_show_class_members', True, True)
	+
	+ # Extra mangling domains
	+ app.add_domain(NumpyPythonDomain)
	+ app.add_domain(NumpyCDomain)
	+
	+#------------------------------------------------------------------------------
	+# Docstring-mangling domains
	+#------------------------------------------------------------------------------
	+
	+from docutils.statemachine import ViewList
	+from sphinx.domains.c import CDomain
	+from sphinx.domains.python import PythonDomain
	+
	+class ManglingDomainBase(object):
	+ directive_mangling_map = {}
	+
	+ def __init__(self, a, *kw):
	+ super(ManglingDomainBase, self).__init__(a, *kw)
	+ self.wrap_mangling_directives()
	+
	+ def wrap_mangling_directives(self):
	+ for name, objtype in self.directive_mangling_map.items():
	+ self.directives[name] = wrap_mangling_directive(
	+ self.directives[name], objtype)
	+
	+class NumpyPythonDomain(ManglingDomainBase, PythonDomain):
	+ name = 'np'
	+ directive_mangling_map = {
	+ 'function': 'function',
	+ 'class': 'class',
	+ 'exception': 'class',
	+ 'method': 'function',
	+ 'classmethod': 'function',
	+ 'staticmethod': 'function',
	+ 'attribute': 'attribute',
	+ }
	+
	+class NumpyCDomain(ManglingDomainBase, CDomain):
	+ name = 'np-c'
	+ directive_mangling_map = {
	+ 'function': 'function',
	+ 'member': 'attribute',
	+ 'macro': 'function',
	+ 'type': 'class',
	+ 'var': 'object',
	+ }
	+
	+def wrap_mangling_directive(base_directive, objtype):
	+ class directive(base_directive):
	+ def run(self):
	+ env = self.state.document.settings.env
	+
	+ name = None
	+ if self.arguments:
	+ m = re.match(r'^(.\s+)?(.?)(\(.*)?', self.arguments[0])
	+ name = m.group(2).strip()
	+
	+ if not name:
	+ name = self.arguments[0]
	+
	+ lines = list(self.content)
	+ mangle_docstrings(env.app, objtype, name, None, None, lines)
	+ self.content = ViewList(lines, self.content.parent)
	+
	+ return base_directive.run(self)
	+
	+ return directive
	+
	diff --git a/Doc/newdoc/sphinxext/numpydoc.pyc b/Doc/newdoc/sphinxext/numpydoc.pyc
	new file mode 100644
	index 0000000..94acc49
	Binary files /dev/null and b/Doc/newdoc/sphinxext/numpydoc.pyc differ
	diff --git a/Doc/newdoc/sphinxext/phantom_import.py b/Doc/newdoc/sphinxext/phantom_import.py
	new file mode 100644
	index 0000000..c77eeb5
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/phantom_import.py
	@@ -0,0 +1,162 @@
	+"""
	+==============
	+phantom_import
	+==============
	+
	+Sphinx extension to make directives from ``sphinx.ext.autodoc`` and similar
	+extensions to use docstrings loaded from an XML file.
	+
	+This extension loads an XML file in the Pydocweb format [1] and
	+creates a dummy module that contains the specified docstrings. This
	+can be used to get the current docstrings from a Pydocweb instance
	+without needing to rebuild the documented module.
	+
	+.. [1] http://code.google.com/p/pydocweb
	+
	+"""
	+import imp, sys, compiler, types, os, inspect, re
	+
	+def setup(app):
	+ app.connect('builder-inited', initialize)
	+ app.add_config_value('phantom_import_file', None, True)
	+
	+def initialize(app):
	+ fn = app.config.phantom_import_file
	+ if (fn and os.path.isfile(fn)):
	+ print "[numpydoc] Phantom importing modules from", fn, "..."
	+ import_phantom_module(fn)
	+
	+#------------------------------------------------------------------------------
	+# Creating 'phantom' modules from an XML description
	+#------------------------------------------------------------------------------
	+def import_phantom_module(xml_file):
	+ """
	+ Insert a fake Python module to sys.modules, based on a XML file.
	+
	+ The XML file is expected to conform to Pydocweb DTD. The fake
	+ module will contain dummy objects, which guarantee the following:
	+
	+ - Docstrings are correct.
	+ - Class inheritance relationships are correct (if present in XML).
	+ - Function argspec is NOT correct (even if present in XML).
	+ Instead, the function signature is prepended to the function docstring.
	+ - Class attributes are NOT correct; instead, they are dummy objects.
	+
	+ Parameters
	+ ----------
	+ xml_file : str
	+ Name of an XML file to read
	+
	+ """
	+ import lxml.etree as etree
	+
	+ object_cache = {}
	+
	+ tree = etree.parse(xml_file)
	+ root = tree.getroot()
	+
	+ # Sort items so that
	+ # - Base classes come before classes inherited from them
	+ # - Modules come before their contents
	+ all_nodes = dict([(n.attrib['id'], n) for n in root])
	+
	+ def _get_bases(node, recurse=False):
	+ bases = [x.attrib['ref'] for x in node.findall('base')]
	+ if recurse:
	+ j = 0
	+ while True:
	+ try:
	+ b = bases[j]
	+ except IndexError: break
	+ if b in all_nodes:
	+ bases.extend(_get_bases(all_nodes[b]))
	+ j += 1
	+ return bases
	+
	+ type_index = ['module', 'class', 'callable', 'object']
	+
	+ def base_cmp(a, b):
	+ x = cmp(type_index.index(a.tag), type_index.index(b.tag))
	+ if x != 0: return x
	+
	+ if a.tag == 'class' and b.tag == 'class':
	+ a_bases = _get_bases(a, recurse=True)
	+ b_bases = _get_bases(b, recurse=True)
	+ x = cmp(len(a_bases), len(b_bases))
	+ if x != 0: return x
	+ if a.attrib['id'] in b_bases: return -1
	+ if b.attrib['id'] in a_bases: return 1
	+
	+ return cmp(a.attrib['id'].count('.'), b.attrib['id'].count('.'))
	+
	+ nodes = root.getchildren()
	+ nodes.sort(base_cmp)
	+
	+ # Create phantom items
	+ for node in nodes:
	+ name = node.attrib['id']
	+ doc = (node.text or '').decode('string-escape') + "\n"
	+ if doc == "\n": doc = ""
	+
	+ # create parent, if missing
	+ parent = name
	+ while True:
	+ parent = '.'.join(parent.split('.')[:-1])
	+ if not parent: break
	+ if parent in object_cache: break
	+ obj = imp.new_module(parent)
	+ object_cache[parent] = obj
	+ sys.modules[parent] = obj
	+
	+ # create object
	+ if node.tag == 'module':
	+ obj = imp.new_module(name)
	+ obj.__doc__ = doc
	+ sys.modules[name] = obj
	+ elif node.tag == 'class':
	+ bases = [object_cache[b] for b in _get_bases(node)
	+ if b in object_cache]
	+ bases.append(object)
	+ init = lambda self: None
	+ init.__doc__ = doc
	+ obj = type(name, tuple(bases), {'__doc__': doc, '__init__': init})
	+ obj.__name__ = name.split('.')[-1]
	+ elif node.tag == 'callable':
	+ funcname = node.attrib['id'].split('.')[-1]
	+ argspec = node.attrib.get('argspec')
	+ if argspec:
	+ argspec = re.sub('^[^(]*', '', argspec)
	+ doc = "%s%s\n\n%s" % (funcname, argspec, doc)
	+ obj = lambda: 0
	+ obj.__argspec_is_invalid_ = True
	+ obj.func_name = funcname
	+ obj.__name__ = name
	+ obj.__doc__ = doc
	+ if inspect.isclass(object_cache[parent]):
	+ obj.__objclass__ = object_cache[parent]
	+ else:
	+ class Dummy(object): pass
	+ obj = Dummy()
	+ obj.__name__ = name
	+ obj.__doc__ = doc
	+ if inspect.isclass(object_cache[parent]):
	+ obj.__get__ = lambda: None
	+ object_cache[name] = obj
	+
	+ if parent:
	+ if inspect.ismodule(object_cache[parent]):
	+ obj.__module__ = parent
	+ setattr(object_cache[parent], name.split('.')[-1], obj)
	+
	+ # Populate items
	+ for node in root:
	+ obj = object_cache.get(node.attrib['id'])
	+ if obj is None: continue
	+ for ref in node.findall('ref'):
	+ if node.tag == 'class':
	+ if ref.attrib['ref'].startswith(node.attrib['id'] + '.'):
	+ setattr(obj, ref.attrib['name'],
	+ object_cache.get(ref.attrib['ref']))
	+ else:
	+ setattr(obj, ref.attrib['name'],
	+ object_cache.get(ref.attrib['ref']))
	diff --git a/Doc/newdoc/sphinxext/plot_directive.py b/Doc/newdoc/sphinxext/plot_directive.py
	new file mode 100644
	index 0000000..80801e7
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/plot_directive.py
	@@ -0,0 +1,636 @@
	+"""
	+A special directive for generating a matplotlib plot.
	+
	+.. warning::
	+
	+ This is a hacked version of plot_directive.py from Matplotlib.
	+ It's very much subject to change!
	+
	+
	+Usage
	+-----
	+
	+Can be used like this::
	+
	+ .. plot:: examples/example.py
	+
	+ .. plot::
	+
	+ import matplotlib.pyplot as plt
	+ plt.plot([1,2,3], [4,5,6])
	+
	+ .. plot::
	+
	+ A plotting example:
	+
	+ >>> import matplotlib.pyplot as plt
	+ >>> plt.plot([1,2,3], [4,5,6])
	+
	+The content is interpreted as doctest formatted if it has a line starting
	+with ``>>>``.
	+
	+The ``plot`` directive supports the options
	+
	+ format : {'python', 'doctest'}
	+ Specify the format of the input
	+
	+ include-source : bool
	+ Whether to display the source code. Default can be changed in conf.py
	+
	+and the ``image`` directive options ``alt``, ``height``, ``width``,
	+``scale``, ``align``, ``class``.
	+
	+Configuration options
	+---------------------
	+
	+The plot directive has the following configuration options:
	+
	+ plot_include_source
	+ Default value for the include-source option
	+
	+ plot_pre_code
	+ Code that should be executed before each plot.
	+
	+ plot_basedir
	+ Base directory, to which plot:: file names are relative to.
	+ (If None or empty, file names are relative to the directoly where
	+ the file containing the directive is.)
	+
	+ plot_formats
	+ File formats to generate. List of tuples or strings::
	+
	+ [(suffix, dpi), suffix, ...]
	+
	+ that determine the file format and the DPI. For entries whose
	+ DPI was omitted, sensible defaults are chosen.
	+
	+ plot_html_show_formats
	+ Whether to show links to the files in HTML.
	+
	+TODO
	+----
	+
	+* Refactor Latex output; now it's plain images, but it would be nice
	+ to make them appear side-by-side, or in floats.
	+
	+"""
	+
	+import sys, os, glob, shutil, imp, warnings, cStringIO, re, textwrap, traceback
	+import sphinx
	+
	+import warnings
	+warnings.warn("A plot_directive module is also available under "
	+ "matplotlib.sphinxext; expect this numpydoc.plot_directive "
	+ "module to be deprecated after relevant features have been "
	+ "integrated there.",
	+ FutureWarning, stacklevel=2)
	+
	+
	+#------------------------------------------------------------------------------
	+# Registration hook
	+#------------------------------------------------------------------------------
	+
	+def setup(app):
	+ setup.app = app
	+ setup.config = app.config
	+ setup.confdir = app.confdir
	+
	+ app.add_config_value('plot_pre_code', '', True)
	+ app.add_config_value('plot_include_source', False, True)
	+ app.add_config_value('plot_formats', ['png', 'hires.png', 'pdf'], True)
	+ app.add_config_value('plot_basedir', None, True)
	+ app.add_config_value('plot_html_show_formats', True, True)
	+
	+ app.add_directive('plot', plot_directive, True, (0, 1, False),
	+ **plot_directive_options)
	+
	+#------------------------------------------------------------------------------
	+# plot:: directive
	+#------------------------------------------------------------------------------
	+from docutils.parsers.rst import directives
	+from docutils import nodes
	+
	+def plot_directive(name, arguments, options, content, lineno,
	+ content_offset, block_text, state, state_machine):
	+ return run(arguments, content, options, state_machine, state, lineno)
	+plot_directive.__doc__ = __doc__
	+
	+def _option_boolean(arg):
	+ if not arg or not arg.strip():
	+ # no argument given, assume used as a flag
	+ return True
	+ elif arg.strip().lower() in ('no', '0', 'false'):
	+ return False
	+ elif arg.strip().lower() in ('yes', '1', 'true'):
	+ return True
	+ else:
	+ raise ValueError('"%s" unknown boolean' % arg)
	+
	+def _option_format(arg):
	+ return directives.choice(arg, ('python', 'lisp'))
	+
	+def _option_align(arg):
	+ return directives.choice(arg, ("top", "middle", "bottom", "left", "center",
	+ "right"))
	+
	+plot_directive_options = {'alt': directives.unchanged,
	+ 'height': directives.length_or_unitless,
	+ 'width': directives.length_or_percentage_or_unitless,
	+ 'scale': directives.nonnegative_int,
	+ 'align': _option_align,
	+ 'class': directives.class_option,
	+ 'include-source': _option_boolean,
	+ 'format': _option_format,
	+ }
	+
	+#------------------------------------------------------------------------------
	+# Generating output
	+#------------------------------------------------------------------------------
	+
	+from docutils import nodes, utils
	+
	+try:
	+ # Sphinx depends on either Jinja or Jinja2
	+ import jinja2
	+ def format_template(template, **kw):
	+ return jinja2.Template(template).render(**kw)
	+except ImportError:
	+ import jinja
	+ def format_template(template, **kw):
	+ return jinja.from_string(template, **kw)
	+
	+TEMPLATE = """
	+{{ source_code }}
	+
	+{{ only_html }}
	+
	+ {% if source_link or (html_show_formats and not multi_image) %}
	+ (
	+ {%- if source_link -%}
	+ `Source code <{{ source_link }}>`__
	+ {%- endif -%}
	+ {%- if html_show_formats and not multi_image -%}
	+ {%- for img in images -%}
	+ {%- for fmt in img.formats -%}
	+ {%- if source_link or not loop.first -%}, {% endif -%}
	+ `{{ fmt }} <{{ dest_dir }}/{{ img.basename }}.{{ fmt }}>`__
	+ {%- endfor -%}
	+ {%- endfor -%}
	+ {%- endif -%}
	+ )
	+ {% endif %}
	+
	+ {% for img in images %}
	+ .. figure:: {{ build_dir }}/{{ img.basename }}.png
	+ {%- for option in options %}
	+ {{ option }}
	+ {% endfor %}
	+
	+ {% if html_show_formats and multi_image -%}
	+ (
	+ {%- for fmt in img.formats -%}
	+ {%- if not loop.first -%}, {% endif -%}
	+ `{{ fmt }} <{{ dest_dir }}/{{ img.basename }}.{{ fmt }}>`__
	+ {%- endfor -%}
	+ )
	+ {%- endif -%}
	+ {% endfor %}
	+
	+{{ only_latex }}
	+
	+ {% for img in images %}
	+ .. image:: {{ build_dir }}/{{ img.basename }}.pdf
	+ {% endfor %}
	+
	+"""
	+
	+class ImageFile(object):
	+ def __init__(self, basename, dirname):
	+ self.basename = basename
	+ self.dirname = dirname
	+ self.formats = []
	+
	+ def filename(self, format):
	+ return os.path.join(self.dirname, "%s.%s" % (self.basename, format))
	+
	+ def filenames(self):
	+ return [self.filename(fmt) for fmt in self.formats]
	+
	+def run(arguments, content, options, state_machine, state, lineno):
	+ if arguments and content:
	+ raise RuntimeError("plot:: directive can't have both args and content")
	+
	+ document = state_machine.document
	+ config = document.settings.env.config
	+
	+ options.setdefault('include-source', config.plot_include_source)
	+
	+ # determine input
	+ rst_file = document.attributes['source']
	+ rst_dir = os.path.dirname(rst_file)
	+
	+ if arguments:
	+ if not config.plot_basedir:
	+ source_file_name = os.path.join(rst_dir,
	+ directives.uri(arguments[0]))
	+ else:
	+ source_file_name = os.path.join(setup.confdir, config.plot_basedir,
	+ directives.uri(arguments[0]))
	+ code = open(source_file_name, 'r').read()
	+ output_base = os.path.basename(source_file_name)
	+ else:
	+ source_file_name = rst_file
	+ code = textwrap.dedent("\n".join(map(str, content)))
	+ counter = document.attributes.get('_plot_counter', 0) + 1
	+ document.attributes['_plot_counter'] = counter
	+ base, ext = os.path.splitext(os.path.basename(source_file_name))
	+ output_base = '%s-%d.py' % (base, counter)
	+
	+ base, source_ext = os.path.splitext(output_base)
	+ if source_ext in ('.py', '.rst', '.txt'):
	+ output_base = base
	+ else:
	+ source_ext = ''
	+
	+ # ensure that LaTeX includegraphics doesn't choke in foo.bar.pdf filenames
	+ output_base = output_base.replace('.', '-')
	+
	+ # is it in doctest format?
	+ is_doctest = contains_doctest(code)
	+ if options.has_key('format'):
	+ if options['format'] == 'python':
	+ is_doctest = False
	+ else:
	+ is_doctest = True
	+
	+ # determine output directory name fragment
	+ source_rel_name = relpath(source_file_name, setup.confdir)
	+ source_rel_dir = os.path.dirname(source_rel_name)
	+ while source_rel_dir.startswith(os.path.sep):
	+ source_rel_dir = source_rel_dir[1:]
	+
	+ # build_dir: where to place output files (temporarily)
	+ build_dir = os.path.join(os.path.dirname(setup.app.doctreedir),
	+ 'plot_directive',
	+ source_rel_dir)
	+ if not os.path.exists(build_dir):
	+ os.makedirs(build_dir)
	+
	+ # output_dir: final location in the builder's directory
	+ dest_dir = os.path.abspath(os.path.join(setup.app.builder.outdir,
	+ source_rel_dir))
	+
	+ # how to link to files from the RST file
	+ dest_dir_link = os.path.join(relpath(setup.confdir, rst_dir),
	+ source_rel_dir).replace(os.path.sep, '/')
	+ build_dir_link = relpath(build_dir, rst_dir).replace(os.path.sep, '/')
	+ source_link = dest_dir_link + '/' + output_base + source_ext
	+
	+ # make figures
	+ try:
	+ results = makefig(code, source_file_name, build_dir, output_base,
	+ config)
	+ errors = []
	+ except PlotError, err:
	+ reporter = state.memo.reporter
	+ sm = reporter.system_message(
	+ 2, "Exception occurred in plotting %s: %s" % (output_base, err),
	+ line=lineno)
	+ results = [(code, [])]
	+ errors = [sm]
	+
	+ # generate output restructuredtext
	+ total_lines = []
	+ for j, (code_piece, images) in enumerate(results):
	+ if options['include-source']:
	+ if is_doctest:
	+ lines = ['']
	+ lines += [row.rstrip() for row in code_piece.split('\n')]
	+ else:
	+ lines = ['.. code-block:: python', '']
	+ lines += [' %s' % row.rstrip()
	+ for row in code_piece.split('\n')]
	+ source_code = "\n".join(lines)
	+ else:
	+ source_code = ""
	+
	+ opts = [':%s: %s' % (key, val) for key, val in options.items()
	+ if key in ('alt', 'height', 'width', 'scale', 'align', 'class')]
	+
	+ only_html = ".. only:: html"
	+ only_latex = ".. only:: latex"
	+
	+ if j == 0:
	+ src_link = source_link
	+ else:
	+ src_link = None
	+
	+ result = format_template(
	+ TEMPLATE,
	+ dest_dir=dest_dir_link,
	+ build_dir=build_dir_link,
	+ source_link=src_link,
	+ multi_image=len(images) > 1,
	+ only_html=only_html,
	+ only_latex=only_latex,
	+ options=opts,
	+ images=images,
	+ source_code=source_code,
	+ html_show_formats=config.plot_html_show_formats)
	+
	+ total_lines.extend(result.split("\n"))
	+ total_lines.extend("\n")
	+
	+ if total_lines:
	+ state_machine.insert_input(total_lines, source=source_file_name)
	+
	+ # copy image files to builder's output directory
	+ if not os.path.exists(dest_dir):
	+ os.makedirs(dest_dir)
	+
	+ for code_piece, images in results:
	+ for img in images:
	+ for fn in img.filenames():
	+ shutil.copyfile(fn, os.path.join(dest_dir,
	+ os.path.basename(fn)))
	+
	+ # copy script (if necessary)
	+ if source_file_name == rst_file:
	+ target_name = os.path.join(dest_dir, output_base + source_ext)
	+ f = open(target_name, 'w')
	+ f.write(unescape_doctest(code))
	+ f.close()
	+
	+ return errors
	+
	+
	+#------------------------------------------------------------------------------
	+# Run code and capture figures
	+#------------------------------------------------------------------------------
	+
	+import matplotlib
	+matplotlib.use('Agg')
	+import matplotlib.pyplot as plt
	+import matplotlib.image as image
	+from matplotlib import _pylab_helpers
	+
	+import exceptions
	+
	+def contains_doctest(text):
	+ try:
	+ # check if it's valid Python as-is
	+ compile(text, '<string>', 'exec')
	+ return False
	+ except SyntaxError:
	+ pass
	+ r = re.compile(r'^\s*>>>', re.M)
	+ m = r.search(text)
	+ return bool(m)
	+
	+def unescape_doctest(text):
	+ """
	+ Extract code from a piece of text, which contains either Python code
	+ or doctests.
	+
	+ """
	+ if not contains_doctest(text):
	+ return text
	+
	+ code = ""
	+ for line in text.split("\n"):
	+ m = re.match(r'^\s(>>>\|\.\.\.) (.)$', line)
	+ if m:
	+ code += m.group(2) + "\n"
	+ elif line.strip():
	+ code += "# " + line.strip() + "\n"
	+ else:
	+ code += "\n"
	+ return code
	+
	+def split_code_at_show(text):
	+ """
	+ Split code at plt.show()
	+
	+ """
	+
	+ parts = []
	+ is_doctest = contains_doctest(text)
	+
	+ part = []
	+ for line in text.split("\n"):
	+ if (not is_doctest and line.strip() == 'plt.show()') or \
	+ (is_doctest and line.strip() == '>>> plt.show()'):
	+ part.append(line)
	+ parts.append("\n".join(part))
	+ part = []
	+ else:
	+ part.append(line)
	+ if "\n".join(part).strip():
	+ parts.append("\n".join(part))
	+ return parts
	+
	+class PlotError(RuntimeError):
	+ pass
	+
	+def run_code(code, code_path, ns=None):
	+ # Change the working directory to the directory of the example, so
	+ # it can get at its data files, if any.
	+ pwd = os.getcwd()
	+ old_sys_path = list(sys.path)
	+ if code_path is not None:
	+ dirname = os.path.abspath(os.path.dirname(code_path))
	+ os.chdir(dirname)
	+ sys.path.insert(0, dirname)
	+
	+ # Redirect stdout
	+ stdout = sys.stdout
	+ sys.stdout = cStringIO.StringIO()
	+
	+ # Reset sys.argv
	+ old_sys_argv = sys.argv
	+ sys.argv = [code_path]
	+
	+ try:
	+ try:
	+ code = unescape_doctest(code)
	+ if ns is None:
	+ ns = {}
	+ if not ns:
	+ exec setup.config.plot_pre_code in ns
	+ exec code in ns
	+ except (Exception, SystemExit), err:
	+ raise PlotError(traceback.format_exc())
	+ finally:
	+ os.chdir(pwd)
	+ sys.argv = old_sys_argv
	+ sys.path[:] = old_sys_path
	+ sys.stdout = stdout
	+ return ns
	+
	+
	+#------------------------------------------------------------------------------
	+# Generating figures
	+#------------------------------------------------------------------------------
	+
	+def out_of_date(original, derived):
	+ """
	+ Returns True if derivative is out-of-date wrt original,
	+ both of which are full file paths.
	+ """
	+ return (not os.path.exists(derived)
	+ or os.stat(derived).st_mtime < os.stat(original).st_mtime)
	+
	+
	+def makefig(code, code_path, output_dir, output_base, config):
	+ """
	+ Run a pyplot script code and save the images under output_dir
	+ with file names derived from output_base
	+
	+ """
	+
	+ # -- Parse format list
	+ default_dpi = {'png': 80, 'hires.png': 200, 'pdf': 50}
	+ formats = []
	+ for fmt in config.plot_formats:
	+ if isinstance(fmt, str):
	+ formats.append((fmt, default_dpi.get(fmt, 80)))
	+ elif type(fmt) in (tuple, list) and len(fmt)==2:
	+ formats.append((str(fmt[0]), int(fmt[1])))
	+ else:
	+ raise PlotError('invalid image format "%r" in plot_formats' % fmt)
	+
	+ # -- Try to determine if all images already exist
	+
	+ code_pieces = split_code_at_show(code)
	+
	+ # Look for single-figure output files first
	+ all_exists = True
	+ img = ImageFile(output_base, output_dir)
	+ for format, dpi in formats:
	+ if out_of_date(code_path, img.filename(format)):
	+ all_exists = False
	+ break
	+ img.formats.append(format)
	+
	+ if all_exists:
	+ return [(code, [img])]
	+
	+ # Then look for multi-figure output files
	+ results = []
	+ all_exists = True
	+ for i, code_piece in enumerate(code_pieces):
	+ images = []
	+ for j in xrange(1000):
	+ img = ImageFile('%s_%02d_%02d' % (output_base, i, j), output_dir)
	+ for format, dpi in formats:
	+ if out_of_date(code_path, img.filename(format)):
	+ all_exists = False
	+ break
	+ img.formats.append(format)
	+
	+ # assume that if we have one, we have them all
	+ if not all_exists:
	+ all_exists = (j > 0)
	+ break
	+ images.append(img)
	+ if not all_exists:
	+ break
	+ results.append((code_piece, images))
	+
	+ if all_exists:
	+ return results
	+
	+ # -- We didn't find the files, so build them
	+
	+ results = []
	+ ns = {}
	+
	+ for i, code_piece in enumerate(code_pieces):
	+ # Clear between runs
	+ plt.close('all')
	+
	+ # Run code
	+ run_code(code_piece, code_path, ns)
	+
	+ # Collect images
	+ images = []
	+ fig_managers = _pylab_helpers.Gcf.get_all_fig_managers()
	+ for j, figman in enumerate(fig_managers):
	+ if len(fig_managers) == 1 and len(code_pieces) == 1:
	+ img = ImageFile(output_base, output_dir)
	+ else:
	+ img = ImageFile("%s_%02d_%02d" % (output_base, i, j),
	+ output_dir)
	+ images.append(img)
	+ for format, dpi in formats:
	+ try:
	+ figman.canvas.figure.savefig(img.filename(format), dpi=dpi)
	+ except exceptions.BaseException, err:
	+ raise PlotError(traceback.format_exc())
	+ img.formats.append(format)
	+
	+ # Results
	+ results.append((code_piece, images))
	+
	+ return results
	+
	+
	+#------------------------------------------------------------------------------
	+# Relative pathnames
	+#------------------------------------------------------------------------------
	+
	+try:
	+ from os.path import relpath
	+except ImportError:
	+ # Copied from Python 2.7
	+ if 'posix' in sys.builtin_module_names:
	+ def relpath(path, start=os.path.curdir):
	+ """Return a relative version of a path"""
	+ from os.path import sep, curdir, join, abspath, commonprefix, \
	+ pardir
	+
	+ if not path:
	+ raise ValueError("no path specified")
	+
	+ start_list = abspath(start).split(sep)
	+ path_list = abspath(path).split(sep)
	+
	+ # Work out how much of the filepath is shared by start and path.
	+ i = len(commonprefix([start_list, path_list]))
	+
	+ rel_list = [pardir] * (len(start_list)-i) + path_list[i:]
	+ if not rel_list:
	+ return curdir
	+ return join(*rel_list)
	+ elif 'nt' in sys.builtin_module_names:
	+ def relpath(path, start=os.path.curdir):
	+ """Return a relative version of a path"""
	+ from os.path import sep, curdir, join, abspath, commonprefix, \
	+ pardir, splitunc
	+
	+ if not path:
	+ raise ValueError("no path specified")
	+ start_list = abspath(start).split(sep)
	+ path_list = abspath(path).split(sep)
	+ if start_list[0].lower() != path_list[0].lower():
	+ unc_path, rest = splitunc(path)
	+ unc_start, rest = splitunc(start)
	+ if bool(unc_path) ^ bool(unc_start):
	+ raise ValueError("Cannot mix UNC and non-UNC paths (%s and %s)"
	+ % (path, start))
	+ else:
	+ raise ValueError("path is on drive %s, start on drive %s"
	+ % (path_list[0], start_list[0]))
	+ # Work out how much of the filepath is shared by start and path.
	+ for i in range(min(len(start_list), len(path_list))):
	+ if start_list[i].lower() != path_list[i].lower():
	+ break
	+ else:
	+ i += 1
	+
	+ rel_list = [pardir] * (len(start_list)-i) + path_list[i:]
	+ if not rel_list:
	+ return curdir
	+ return join(*rel_list)
	+ else:
	+ raise RuntimeError("Unsupported platform (no relpath available!)")
	diff --git a/Doc/newdoc/sphinxext/plot_directive.pyc b/Doc/newdoc/sphinxext/plot_directive.pyc
	new file mode 100644
	index 0000000..41ba83e
	Binary files /dev/null and b/Doc/newdoc/sphinxext/plot_directive.pyc differ
	diff --git a/Doc/newdoc/sphinxext/setup.py b/Doc/newdoc/sphinxext/setup.py
	new file mode 100644
	index 0000000..76e3fd8
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/setup.py
	@@ -0,0 +1,31 @@
	+from distutils.core import setup
	+import setuptools
	+import sys, os
	+
	+version = "0.4"
	+
	+setup(
	+ name="numpydoc",
	+ packages=["numpydoc"],
	+ package_dir={"numpydoc": ""},
	+ version=version,
	+ description="Sphinx extension to support docstrings in Numpy format",
	+ # classifiers from http://pypi.python.org/pypi?%3Aaction=list_classifiers
	+ classifiers=["Development Status :: 3 - Alpha",
	+ "Environment :: Plugins",
	+ "License :: OSI Approved :: BSD License",
	+ "Topic :: Documentation"],
	+ keywords="sphinx numpy",
	+ author="Pauli Virtanen and others",
	+ author_email="pav@iki.fi",
	+ url="http://github.com/numpy/numpy/tree/master/doc/sphinxext",
	+ license="BSD",
	+ zip_safe=False,
	+ install_requires=["Sphinx >= 1.0.1"],
	+ package_data={'numpydoc': 'tests', '': ''},
	+ entry_points={
	+ "console_scripts": [
	+ "autosummary_generate = numpydoc.autosummary_generate:main",
	+ ],
	+ },
	+)
	diff --git a/Doc/newdoc/sphinxext/tests/test_docscrape.py b/Doc/newdoc/sphinxext/tests/test_docscrape.py
	new file mode 100644
	index 0000000..6fab798
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/tests/test_docscrape.py
	@@ -0,0 +1,615 @@
	+# -- encoding:utf-8 --
	+
	+import sys, os
	+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
	+
	+from docscrape import NumpyDocString, FunctionDoc, ClassDoc
	+from docscrape_sphinx import SphinxDocString, SphinxClassDoc
	+from nose.tools import *
	+
	+doc_txt = '''\
	+ numpy.multivariate_normal(mean, cov, shape=None, spam=None)
	+
	+ Draw values from a multivariate normal distribution with specified
	+ mean and covariance.
	+
	+ The multivariate normal or Gaussian distribution is a generalisation
	+ of the one-dimensional normal distribution to higher dimensions.
	+
	+ Parameters
	+ ----------
	+ mean : (N,) ndarray
	+ Mean of the N-dimensional distribution.
	+
	+ .. math::
	+
	+ (1+2+3)/3
	+
	+ cov : (N,N) ndarray
	+ Covariance matrix of the distribution.
	+ shape : tuple of ints
	+ Given a shape of, for example, (m,n,k), mnk samples are
	+ generated, and packed in an m-by-n-by-k arrangement. Because
	+ each sample is N-dimensional, the output shape is (m,n,k,N).
	+
	+ Returns
	+ -------
	+ out : ndarray
	+ The drawn samples, arranged according to `shape`. If the
	+ shape given is (m,n,...), then the shape of `out` is is
	+ (m,n,...,N).
	+
	+ In other words, each entry ``out[i,j,...,:]`` is an N-dimensional
	+ value drawn from the distribution.
	+
	+ Other Parameters
	+ ----------------
	+ spam : parrot
	+ A parrot off its mortal coil.
	+
	+ Raises
	+ ------
	+ RuntimeError
	+ Some error
	+
	+ Warns
	+ -----
	+ RuntimeWarning
	+ Some warning
	+
	+ Warnings
	+ --------
	+ Certain warnings apply.
	+
	+ Notes
	+ -----
	+
	+ Instead of specifying the full covariance matrix, popular
	+ approximations include:
	+
	+ - Spherical covariance (`cov` is a multiple of the identity matrix)
	+ - Diagonal covariance (`cov` has non-negative elements only on the diagonal)
	+
	+ This geometrical property can be seen in two dimensions by plotting
	+ generated data-points:
	+
	+ >>> mean = [0,0]
	+ >>> cov = [[1,0],[0,100]] # diagonal covariance, points lie on x or y-axis
	+
	+ >>> x,y = multivariate_normal(mean,cov,5000).T
	+ >>> plt.plot(x,y,'x'); plt.axis('equal'); plt.show()
	+
	+ Note that the covariance matrix must be symmetric and non-negative
	+ definite.
	+
	+ References
	+ ----------
	+ .. [1] A. Papoulis, "Probability, Random Variables, and Stochastic
	+ Processes," 3rd ed., McGraw-Hill Companies, 1991
	+ .. [2] R.O. Duda, P.E. Hart, and D.G. Stork, "Pattern Classification,"
	+ 2nd ed., Wiley, 2001.
	+
	+ See Also
	+ --------
	+ some, other, funcs
	+ otherfunc : relationship
	+
	+ Examples
	+ --------
	+ >>> mean = (1,2)
	+ >>> cov = [[1,0],[1,0]]
	+ >>> x = multivariate_normal(mean,cov,(3,3))
	+ >>> print x.shape
	+ (3, 3, 2)
	+
	+ The following is probably true, given that 0.6 is roughly twice the
	+ standard deviation:
	+
	+ >>> print list( (x[0,0,:] - mean) < 0.6 )
	+ [True, True]
	+
	+ .. index:: random
	+ :refguide: random;distributions, random;gauss
	+
	+ '''
	+doc = NumpyDocString(doc_txt)
	+
	+
	+def test_signature():
	+ assert doc['Signature'].startswith('numpy.multivariate_normal(')
	+ assert doc['Signature'].endswith('spam=None)')
	+
	+def test_summary():
	+ assert doc['Summary'][0].startswith('Draw values')
	+ assert doc['Summary'][-1].endswith('covariance.')
	+
	+def test_extended_summary():
	+ assert doc['Extended Summary'][0].startswith('The multivariate normal')
	+
	+def test_parameters():
	+ assert_equal(len(doc['Parameters']), 3)
	+ assert_equal([n for n,_,_ in doc['Parameters']], ['mean','cov','shape'])
	+
	+ arg, arg_type, desc = doc['Parameters'][1]
	+ assert_equal(arg_type, '(N,N) ndarray')
	+ assert desc[0].startswith('Covariance matrix')
	+ assert doc['Parameters'][0][-1][-2] == ' (1+2+3)/3'
	+
	+def test_other_parameters():
	+ assert_equal(len(doc['Other Parameters']), 1)
	+ assert_equal([n for n,_,_ in doc['Other Parameters']], ['spam'])
	+ arg, arg_type, desc = doc['Other Parameters'][0]
	+ assert_equal(arg_type, 'parrot')
	+ assert desc[0].startswith('A parrot off its mortal coil')
	+
	+def test_returns():
	+ assert_equal(len(doc['Returns']), 1)
	+ arg, arg_type, desc = doc['Returns'][0]
	+ assert_equal(arg, 'out')
	+ assert_equal(arg_type, 'ndarray')
	+ assert desc[0].startswith('The drawn samples')
	+ assert desc[-1].endswith('distribution.')
	+
	+def test_notes():
	+ assert doc['Notes'][0].startswith('Instead')
	+ assert doc['Notes'][-1].endswith('definite.')
	+ assert_equal(len(doc['Notes']), 17)
	+
	+def test_references():
	+ assert doc['References'][0].startswith('..')
	+ assert doc['References'][-1].endswith('2001.')
	+
	+def test_examples():
	+ assert doc['Examples'][0].startswith('>>>')
	+ assert doc['Examples'][-1].endswith('True]')
	+
	+def test_index():
	+ assert_equal(doc['index']['default'], 'random')
	+ print doc['index']
	+ assert_equal(len(doc['index']), 2)
	+ assert_equal(len(doc['index']['refguide']), 2)
	+
	+def non_blank_line_by_line_compare(a,b):
	+ a = [l for l in a.split('\n') if l.strip()]
	+ b = [l for l in b.split('\n') if l.strip()]
	+ for n,line in enumerate(a):
	+ if not line == b[n]:
	+ raise AssertionError("Lines %s of a and b differ: "
	+ "\n>>> %s\n<<< %s\n" %
	+ (n,line,b[n]))
	+def test_str():
	+ non_blank_line_by_line_compare(str(doc),
	+"""numpy.multivariate_normal(mean, cov, shape=None, spam=None)
	+
	+Draw values from a multivariate normal distribution with specified
	+mean and covariance.
	+
	+The multivariate normal or Gaussian distribution is a generalisation
	+of the one-dimensional normal distribution to higher dimensions.
	+
	+Parameters
	+----------
	+mean : (N,) ndarray
	+ Mean of the N-dimensional distribution.
	+
	+ .. math::
	+
	+ (1+2+3)/3
	+
	+cov : (N,N) ndarray
	+ Covariance matrix of the distribution.
	+shape : tuple of ints
	+ Given a shape of, for example, (m,n,k), mnk samples are
	+ generated, and packed in an m-by-n-by-k arrangement. Because
	+ each sample is N-dimensional, the output shape is (m,n,k,N).
	+
	+Returns
	+-------
	+out : ndarray
	+ The drawn samples, arranged according to `shape`. If the
	+ shape given is (m,n,...), then the shape of `out` is is
	+ (m,n,...,N).
	+
	+ In other words, each entry ``out[i,j,...,:]`` is an N-dimensional
	+ value drawn from the distribution.
	+
	+Other Parameters
	+----------------
	+spam : parrot
	+ A parrot off its mortal coil.
	+
	+Raises
	+------
	+RuntimeError :
	+ Some error
	+
	+Warns
	+-----
	+RuntimeWarning :
	+ Some warning
	+
	+Warnings
	+--------
	+Certain warnings apply.
	+
	+See Also
	+--------
	+`some`_, `other`_, `funcs`_
	+
	+`otherfunc`_
	+ relationship
	+
	+Notes
	+-----
	+Instead of specifying the full covariance matrix, popular
	+approximations include:
	+
	+ - Spherical covariance (`cov` is a multiple of the identity matrix)
	+ - Diagonal covariance (`cov` has non-negative elements only on the diagonal)
	+
	+This geometrical property can be seen in two dimensions by plotting
	+generated data-points:
	+
	+>>> mean = [0,0]
	+>>> cov = [[1,0],[0,100]] # diagonal covariance, points lie on x or y-axis
	+
	+>>> x,y = multivariate_normal(mean,cov,5000).T
	+>>> plt.plot(x,y,'x'); plt.axis('equal'); plt.show()
	+
	+Note that the covariance matrix must be symmetric and non-negative
	+definite.
	+
	+References
	+----------
	+.. [1] A. Papoulis, "Probability, Random Variables, and Stochastic
	+ Processes," 3rd ed., McGraw-Hill Companies, 1991
	+.. [2] R.O. Duda, P.E. Hart, and D.G. Stork, "Pattern Classification,"
	+ 2nd ed., Wiley, 2001.
	+
	+Examples
	+--------
	+>>> mean = (1,2)
	+>>> cov = [[1,0],[1,0]]
	+>>> x = multivariate_normal(mean,cov,(3,3))
	+>>> print x.shape
	+(3, 3, 2)
	+
	+The following is probably true, given that 0.6 is roughly twice the
	+standard deviation:
	+
	+>>> print list( (x[0,0,:] - mean) < 0.6 )
	+[True, True]
	+
	+.. index:: random
	+ :refguide: random;distributions, random;gauss""")
	+
	+
	+def test_sphinx_str():
	+ sphinx_doc = SphinxDocString(doc_txt)
	+ non_blank_line_by_line_compare(str(sphinx_doc),
	+"""
	+.. index:: random
	+ single: random;distributions, random;gauss
	+
	+Draw values from a multivariate normal distribution with specified
	+mean and covariance.
	+
	+The multivariate normal or Gaussian distribution is a generalisation
	+of the one-dimensional normal distribution to higher dimensions.
	+
	+:Parameters:
	+
	+ mean : (N,) ndarray
	+
	+ Mean of the N-dimensional distribution.
	+
	+ .. math::
	+
	+ (1+2+3)/3
	+
	+ cov : (N,N) ndarray
	+
	+ Covariance matrix of the distribution.
	+
	+ shape : tuple of ints
	+
	+ Given a shape of, for example, (m,n,k), mnk samples are
	+ generated, and packed in an m-by-n-by-k arrangement. Because
	+ each sample is N-dimensional, the output shape is (m,n,k,N).
	+
	+:Returns:
	+
	+ out : ndarray
	+
	+ The drawn samples, arranged according to `shape`. If the
	+ shape given is (m,n,...), then the shape of `out` is is
	+ (m,n,...,N).
	+
	+ In other words, each entry ``out[i,j,...,:]`` is an N-dimensional
	+ value drawn from the distribution.
	+
	+:Other Parameters:
	+
	+ spam : parrot
	+
	+ A parrot off its mortal coil.
	+
	+:Raises:
	+
	+ RuntimeError :
	+
	+ Some error
	+
	+:Warns:
	+
	+ RuntimeWarning :
	+
	+ Some warning
	+
	+.. warning::
	+
	+ Certain warnings apply.
	+
	+.. seealso::
	+
	+ :obj:`some`, :obj:`other`, :obj:`funcs`
	+
	+ :obj:`otherfunc`
	+ relationship
	+
	+.. rubric:: Notes
	+
	+Instead of specifying the full covariance matrix, popular
	+approximations include:
	+
	+ - Spherical covariance (`cov` is a multiple of the identity matrix)
	+ - Diagonal covariance (`cov` has non-negative elements only on the diagonal)
	+
	+This geometrical property can be seen in two dimensions by plotting
	+generated data-points:
	+
	+>>> mean = [0,0]
	+>>> cov = [[1,0],[0,100]] # diagonal covariance, points lie on x or y-axis
	+
	+>>> x,y = multivariate_normal(mean,cov,5000).T
	+>>> plt.plot(x,y,'x'); plt.axis('equal'); plt.show()
	+
	+Note that the covariance matrix must be symmetric and non-negative
	+definite.
	+
	+.. rubric:: References
	+
	+.. [1] A. Papoulis, "Probability, Random Variables, and Stochastic
	+ Processes," 3rd ed., McGraw-Hill Companies, 1991
	+.. [2] R.O. Duda, P.E. Hart, and D.G. Stork, "Pattern Classification,"
	+ 2nd ed., Wiley, 2001.
	+
	+.. only:: latex
	+
	+ [1]_, [2]_
	+
	+.. rubric:: Examples
	+
	+>>> mean = (1,2)
	+>>> cov = [[1,0],[1,0]]
	+>>> x = multivariate_normal(mean,cov,(3,3))
	+>>> print x.shape
	+(3, 3, 2)
	+
	+The following is probably true, given that 0.6 is roughly twice the
	+standard deviation:
	+
	+>>> print list( (x[0,0,:] - mean) < 0.6 )
	+[True, True]
	+""")
	+
	+
	+doc2 = NumpyDocString("""
	+ Returns array of indices of the maximum values of along the given axis.
	+
	+ Parameters
	+ ----------
	+ a : {array_like}
	+ Array to look in.
	+ axis : {None, integer}
	+ If None, the index is into the flattened array, otherwise along
	+ the specified axis""")
	+
	+def test_parameters_without_extended_description():
	+ assert_equal(len(doc2['Parameters']), 2)
	+
	+doc3 = NumpyDocString("""
	+ my_signature(params, *kwds)
	+
	+ Return this and that.
	+ """)
	+
	+def test_escape_stars():
	+ signature = str(doc3).split('\n')[0]
	+ assert_equal(signature, 'my_signature(\params, \\*kwds)')
	+
	+doc4 = NumpyDocString(
	+ """a.conj()
	+
	+ Return an array with all complex-valued elements conjugated.""")
	+
	+def test_empty_extended_summary():
	+ assert_equal(doc4['Extended Summary'], [])
	+
	+doc5 = NumpyDocString(
	+ """
	+ a.something()
	+
	+ Raises
	+ ------
	+ LinAlgException
	+ If array is singular.
	+
	+ Warns
	+ -----
	+ SomeWarning
	+ If needed
	+ """)
	+
	+def test_raises():
	+ assert_equal(len(doc5['Raises']), 1)
	+ name,_,desc = doc5['Raises'][0]
	+ assert_equal(name,'LinAlgException')
	+ assert_equal(desc,['If array is singular.'])
	+
	+def test_warns():
	+ assert_equal(len(doc5['Warns']), 1)
	+ name,_,desc = doc5['Warns'][0]
	+ assert_equal(name,'SomeWarning')
	+ assert_equal(desc,['If needed'])
	+
	+def test_see_also():
	+ doc6 = NumpyDocString(
	+ """
	+ z(x,theta)
	+
	+ See Also
	+ --------
	+ func_a, func_b, func_c
	+ func_d : some equivalent func
	+ foo.func_e : some other func over
	+ multiple lines
	+ func_f, func_g, :meth:`func_h`, func_j,
	+ func_k
	+ :obj:`baz.obj_q`
	+ :class:`class_j`: fubar
	+ foobar
	+ """)
	+
	+ assert len(doc6['See Also']) == 12
	+ for func, desc, role in doc6['See Also']:
	+ if func in ('func_a', 'func_b', 'func_c', 'func_f',
	+ 'func_g', 'func_h', 'func_j', 'func_k', 'baz.obj_q'):
	+ assert(not desc)
	+ else:
	+ assert(desc)
	+
	+ if func == 'func_h':
	+ assert role == 'meth'
	+ elif func == 'baz.obj_q':
	+ assert role == 'obj'
	+ elif func == 'class_j':
	+ assert role == 'class'
	+ else:
	+ assert role is None
	+
	+ if func == 'func_d':
	+ assert desc == ['some equivalent func']
	+ elif func == 'foo.func_e':
	+ assert desc == ['some other func over', 'multiple lines']
	+ elif func == 'class_j':
	+ assert desc == ['fubar', 'foobar']
	+
	+def test_see_also_print():
	+ class Dummy(object):
	+ """
	+ See Also
	+ --------
	+ func_a, func_b
	+ func_c : some relationship
	+ goes here
	+ func_d
	+ """
	+ pass
	+
	+ obj = Dummy()
	+ s = str(FunctionDoc(obj, role='func'))
	+ assert(':func:`func_a`, :func:`func_b`' in s)
	+ assert(' some relationship' in s)
	+ assert(':func:`func_d`' in s)
	+
	+doc7 = NumpyDocString("""
	+
	+ Doc starts on second line.
	+
	+ """)
	+
	+def test_empty_first_line():
	+ assert doc7['Summary'][0].startswith('Doc starts')
	+
	+
	+def test_no_summary():
	+ str(SphinxDocString("""
	+ Parameters
	+ ----------"""))
	+
	+
	+def test_unicode():
	+ doc = SphinxDocString("""
	+ Ã¶Ã¤Ã¶Ã¤Ã¶Ã¤Ã¶Ã¤Ã¶Ã¥Ã¥Ã¥Ã¥
	+
	+ Ã¶Ã¤Ã¶Ã¤Ã¶Ã¤Ã¶Ã¶Ã¤Ã¥Ã¥Ã¥
	+
	+ Parameters
	+ ----------
	+ Ã¥Ã¥Ã¥ : Ã¤Ã¤Ã¤
	+ Ã¶Ã¶Ã¶
	+
	+ Returns
	+ -------
	+ Ã¥Ã¥Ã¥ : Ã¶Ã¶Ã¶
	+ Ã¤Ã¤Ã¤
	+
	+ """)
	+ assert doc['Summary'][0] == u'Ã¶Ã¤Ã¶Ã¤Ã¶Ã¤Ã¶Ã¤Ã¶Ã¥Ã¥Ã¥Ã¥'.encode('utf-8')
	+
	+def test_plot_examples():
	+ cfg = dict(use_plots=True)
	+
	+ doc = SphinxDocString("""
	+ Examples
	+ --------
	+ >>> import matplotlib.pyplot as plt
	+ >>> plt.plot([1,2,3],[4,5,6])
	+ >>> plt.show()
	+ """, config=cfg)
	+ assert 'plot::' in str(doc), str(doc)
	+
	+ doc = SphinxDocString("""
	+ Examples
	+ --------
	+ .. plot::
	+
	+ import matplotlib.pyplot as plt
	+ plt.plot([1,2,3],[4,5,6])
	+ plt.show()
	+ """, config=cfg)
	+ assert str(doc).count('plot::') == 1, str(doc)
	+
	+def test_class_members():
	+
	+ class Dummy(object):
	+ """
	+ Dummy class.
	+
	+ """
	+ def spam(self, a, b):
	+ """Spam\n\nSpam spam."""
	+ pass
	+ def ham(self, c, d):
	+ """Cheese\n\nNo cheese."""
	+ pass
	+
	+ for cls in (ClassDoc, SphinxClassDoc):
	+ doc = cls(Dummy, config=dict(show_class_members=False))
	+ assert 'Methods' not in str(doc), (cls, str(doc))
	+ assert 'spam' not in str(doc), (cls, str(doc))
	+ assert 'ham' not in str(doc), (cls, str(doc))
	+
	+ doc = cls(Dummy, config=dict(show_class_members=True))
	+ assert 'Methods' in str(doc), (cls, str(doc))
	+ assert 'spam' in str(doc), (cls, str(doc))
	+ assert 'ham' in str(doc), (cls, str(doc))
	+
	+ if cls is SphinxClassDoc:
	+ assert '.. autosummary::' in str(doc), str(doc)
	+
	+if __name__ == "__main__":
	+ import nose
	+ nose.run()
	+
	diff --git a/Doc/newdoc/sphinxext/traitsdoc.py b/Doc/newdoc/sphinxext/traitsdoc.py
	new file mode 100644
	index 0000000..0fcf2c1
	--- /dev/null
	+++ b/Doc/newdoc/sphinxext/traitsdoc.py
	@@ -0,0 +1,140 @@
	+"""
	+=========
	+traitsdoc
	+=========
	+
	+Sphinx extension that handles docstrings in the Numpy standard format, [1]
	+and support Traits [2].
	+
	+This extension can be used as a replacement for ``numpydoc`` when support
	+for Traits is required.
	+
	+.. [1] http://projects.scipy.org/numpy/wiki/CodingStyleGuidelines#docstring-standard
	+.. [2] http://code.enthought.com/projects/traits/
	+
	+"""
	+
	+import inspect
	+import os
	+import pydoc
	+
	+import docscrape
	+import docscrape_sphinx
	+from docscrape_sphinx import SphinxClassDoc, SphinxFunctionDoc, SphinxDocString
	+
	+import numpydoc
	+
	+import comment_eater
	+
	+class SphinxTraitsDoc(SphinxClassDoc):
	+ def __init__(self, cls, modulename='', func_doc=SphinxFunctionDoc):
	+ if not inspect.isclass(cls):
	+ raise ValueError("Initialise using a class. Got %r" % cls)
	+ self._cls = cls
	+
	+ if modulename and not modulename.endswith('.'):
	+ modulename += '.'
	+ self._mod = modulename
	+ self._name = cls.__name__
	+ self._func_doc = func_doc
	+
	+ docstring = pydoc.getdoc(cls)
	+ docstring = docstring.split('\n')
	+
	+ # De-indent paragraph
	+ try:
	+ indent = min(len(s) - len(s.lstrip()) for s in docstring
	+ if s.strip())
	+ except ValueError:
	+ indent = 0
	+
	+ for n,line in enumerate(docstring):
	+ docstring[n] = docstring[n][indent:]
	+
	+ self._doc = docscrape.Reader(docstring)
	+ self._parsed_data = {
	+ 'Signature': '',
	+ 'Summary': '',
	+ 'Description': [],
	+ 'Extended Summary': [],
	+ 'Parameters': [],
	+ 'Returns': [],
	+ 'Raises': [],
	+ 'Warns': [],
	+ 'Other Parameters': [],
	+ 'Traits': [],
	+ 'Methods': [],
	+ 'See Also': [],
	+ 'Notes': [],
	+ 'References': '',
	+ 'Example': '',
	+ 'Examples': '',
	+ 'index': {}
	+ }
	+
	+ self._parse()
	+
	+ def _str_summary(self):
	+ return self['Summary'] + ['']
	+
	+ def _str_extended_summary(self):
	+ return self['Description'] + self['Extended Summary'] + ['']
	+
	+ def __str__(self, indent=0, func_role="func"):
	+ out = []
	+ out += self._str_signature()
	+ out += self._str_index() + ['']
	+ out += self._str_summary()
	+ out += self._str_extended_summary()
	+ for param_list in ('Parameters', 'Traits', 'Methods',
	+ 'Returns','Raises'):
	+ out += self._str_param_list(param_list)
	+ out += self._str_see_also("obj")
	+ out += self._str_section('Notes')
	+ out += self._str_references()
	+ out += self._str_section('Example')
	+ out += self._str_section('Examples')
	+ out = self._str_indent(out,indent)
	+ return '\n'.join(out)
	+
	+def looks_like_issubclass(obj, classname):
	+ """ Return True if the object has a class or superclass with the given class
	+ name.
	+
	+ Ignores old-style classes.
	+ """
	+ t = obj
	+ if t.__name__ == classname:
	+ return True
	+ for klass in t.__mro__:
	+ if klass.__name__ == classname:
	+ return True
	+ return False
	+
	+def get_doc_object(obj, what=None, config=None):
	+ if what is None:
	+ if inspect.isclass(obj):
	+ what = 'class'
	+ elif inspect.ismodule(obj):
	+ what = 'module'
	+ elif callable(obj):
	+ what = 'function'
	+ else:
	+ what = 'object'
	+ if what == 'class':
	+ doc = SphinxTraitsDoc(obj, '', func_doc=SphinxFunctionDoc, config=config)
	+ if looks_like_issubclass(obj, 'HasTraits'):
	+ for name, trait, comment in comment_eater.get_class_traits(obj):
	+ # Exclude private traits.
	+ if not name.startswith('_'):
	+ doc['Traits'].append((name, trait, comment.splitlines()))
	+ return doc
	+ elif what in ('function', 'method'):
	+ return SphinxFunctionDoc(obj, '', config=config)
	+ else:
	+ return SphinxDocString(pydoc.getdoc(obj), config=config)
	+
	+def setup(app):
	+ # init numpydoc
	+ numpydoc.setup(app, get_doc_object)
	+

No OneTemporaryActions

File Metadata

View Options

Event Timeline

No OneTemporary
Actions