merge

doc/src/tut/classes.do.txt

@@ -78,8 +78,8 @@ Looks strange. Fix x axis.
 
 ===== Stochastic curves =====
 
-The `StochasticWavyCurve` object offers three pre-computed
-graphcs that have a random variation:
+The `StochasticWavyCurve` object offers three precomputed
+graphics that have a random variation:
 
 FIGURE: [fig-tut/StochasticWavyCurve.png, width=600 frac=1]
 

doc/src/tut/main_sketcher.do.txt

@@ -9,6 +9,12 @@ src_path_tut = 'http://tinyurl.com/oou9lp7'
 src_path_pysketcher = 'http://tinyurl.com/ot733jn'
 %>
 
+!bbox
+This document is derived from Chapter 9 in the book
+"A Primer on Scientific Programming with Python": "http://www.amazon.com/Scientific-Programming-Computational-Science-Engineering/dp/3642549586/ref=sr_1_2?s=books&ie=UTF8&qid=1407225588&sr=1-2&keywords=langtangen", by H. P. Langtangen,
+4th edition, Springer, 2014.
+!ebox
+
 __Abstract.__
 Pysketcher is a Python package which allows principal sketches of
 physics and mechanics problems to be realized through short programs

doc/src/tut/make.sh

@@ -11,7 +11,7 @@ main=main_sketcher
 doconce format html $main
 
 cp .ptex2tex.cfg-minted .ptex2tex.cfg
-doconce format pdflatex $main
+doconce format pdflatex $main --skip_inline_comments
 ptex2tex -DMINTED $main
 pdflatex -shell-escape $main
 makeindex $main
@@ -19,11 +19,11 @@ pdflatex -shell-escape $main
 pdflatex -shell-escape $main
 
 doconce format sphinx $main --skip_inline_comments
-rm -rf sphinx-rootdir
 doconce sphinx_dir author="H. P. Langtangen" version=0.1 theme=pyramid $main
 python automake_sphinx.py
 
-cp ${main}_primer.pdf ../../tutorial/pysketcher_blue.pdf
-cp ${main}.pdf ../../tutorial/pysketcher.pdf
+dest=../../pub/tutorial
+cp ${main}.pdf $dest/pysketcher.pdf
 #cp $main.html ../../tutorial/pysketcher.html
-cp -r sphinx-rootdir/_build/html ../../tutorial/html
+rm -rf $dest/html
+cp -r sphinx-rootdir/_build/html $dest/html