Merge branch 'master' of https://github.com/AllenDowney/ThinkPython2

AllenDowney · AllenDowney · commit 2a13b7ee9e79 · 2018-11-01T10:29:00.000-04:00
diff --git a/book/Makefile b/book/Makefile
@@ -40,8 +40,18 @@ hevea:	book.tex header.html footer.html
 
 DEST = /home/downey/public_html/greent/thinkpython2
 
-epub:
-	cd html; ebook-convert index.html thinkpython2.epub
+epub: 	book.tex
+	#replace the pdfs with eps
+	sed s/.pdf/.eps/g book.tex >thinkpython2.tex
+	latex thinkpython2
+	rm -rf epub
+	mkdir epub
+	hevea -fix -O -e latexonly htmlonly thinkpython2
+	grep -v latexonly thinkpython2.image.tex > a; mv a thinkpython2.image.tex
+	sed s/\\\\usepackage{fancyhdr}// < thinkpython2.image.tex > a; mv a thinkpython2.image.tex
+	imagen -png thinkpython2
+	mv thinkpython2.html thinkpython2*.png epub
+	cd epub; ebook-convert thinkpython2.html thinkpython2.epub
 
 distrib:
 	rm -rf dist
diff --git a/book/book.tex b/book/book.tex
@@ -723,7 +723,7 @@ \section*{Contributor List}
 % ENDCONTRIB
 
 In addition, people who spotted typos or made corrections include
-Czeslaw Czapla, Dale Wilson,
+Czeslaw Czapla, Dale Wilson, Francesco Carlo Cimini,
 Richard Fursa, Brian McGhie, Lokesh Kumar Makani, Matthew Shultz, Viet
 Le, Victor Simeone, Lars O.D. Christensen, Swarup Sahoo, Alix Etienne,
 Kuang He, Wei Huang, Karen Barber, and Eric Ransom.
@@ -9724,7 +9724,7 @@ \section{Tuples as return values}
 if the value is a tuple, the effect is the same as returning
 multiple values.  For example, if you want to divide two integers
 and compute the quotient and remainder, it is inefficient to
-compute {\tt x/y} and then {\tt x\%y}.  It is better to compute
+compute {\tt x//y} and then {\tt x\%y}.  It is better to compute
 them both at the same time.
 \index{divmod}
 
diff --git a/code/analyze_book1.py b/code/analyze_book1.py
@@ -40,7 +40,7 @@ def skip_gutenberg_header(fp):
     fp: open file object
     """
     for line in fp:
-        if line.startswith('*END*THE SMALL PRINT!'):
+        if line.startswith('*** START OF TH'):
             break
 
 
diff --git a/code/markov.py b/code/markov.py
@@ -42,7 +42,7 @@ def skip_gutenberg_header(fp):
     fp: open file object
     """
     for line in fp:
-        if line.startswith('*END*THE SMALL PRINT!'):
+        if line.startswith('*** START OF TH'):
             break
 
 
