move a lot of material around

Author: dham

doc/Makefile

@@ -138,14 +138,14 @@ latexpdf: apidoc
 	cd $(BUILDDIR)/latex; latexmk -pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
-book: apidoc
+book:
 	$(SPHINXBUILD) $(ALLSPHINXOPTS) -b latex -t book $(BUILDDIR)/book
 	@echo
 	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/book."
 	@echo "Run \`make' in that directory to run these through (pdf)latex" \
 	      "(use \`make bookpdf' here to do that automatically)."
 
-bookpdf: apidoc
+bookpdf:
 	PYTHONPATH=$(PWD)/..:$(PYTHONPATH) $(SPHINXBUILD) -b latex -t book $(ALLSPHINXOPTS) $(BUILDDIR)/book
 	@echo "Running LaTeX files through pdflatex..."
 # $(MAKE) -C $(BUILDDIR)/latex all-pdf

doc/source/11_further_object-oriented_features.rst renamed to doc/source/10_further_object-oriented_features.rst

@@ -330,6 +330,11 @@
 #   u'M345A47 Finite Elements: Analysis and Implementation',
 #   u'David A. Ham and Colin J. Cotter', 'manual'),
 # ]
+latex_documents = [
+    ('index', 'objectorientedprogramming.tex',
+     'Object oriented programming\\\\\\LARGE in Python for mathematicians',
+     'David A. Ham', 'book'),
+]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.

doc/source/8_inheritance.rst renamed to doc/source/7_inheritance.rst

@@ -34,19 +34,26 @@
    4_style.rst
    5_abstract_data_types.rst
    6_exceptions.rst
-   7_midterm.rst
-   8_inheritance.rst
-   9_debugging.rst
-   10_trees_and_directed_acyclic_graphs.rst
-   11_further_object-oriented_features.rst
+   7_inheritance.rst
+   8_debugging.rst
+   9_trees_and_directed_acyclic_graphs.rst
+   10_further_object-oriented_features.rst
 
 .. .. only:: latex and not book
 
 .. raw:: latex
 
       \appendix
 
-..    .. toctree::
+.. only:: latex
+
+   .. toctree::
+      :numbered:
+      :maxdepth: 2
+      
+      a1_help
+      
+
 ..       :numbered:
 ..       :maxdepth: 1