Skip to content

Commit fc6d37e

Browse files
ChrisMayfieldChrisMayfield
committed
Version 6.1.0
1 parent 355c958 commit fc6d37e

File tree

5 files changed

+132
-37
lines changed

5 files changed

+132
-37
lines changed

‎footer.html‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,58 @@ <h4>Are you using one of our books in a class?</h4> We'd like to know
1010
<br>
1111

1212
<p>
13-
<a href="http://www.amazon.com/gp/product/1449370780/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1449370780&linkCode=as2&tag=greenteapre01-20">Think Bayes</a><img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1449370780" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
13+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1491938455/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491938455&linkCode=as2&tag=greenteapre01-20&linkId=2JJH4SWCAVVYSQHO">Think DSP</a>
14+
<img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491938455" width="1" height="1" border="0" alt="">
1415

1516
<p>
16-
<a href="http://www.amazon.com/gp/product/1449370780/ref=as_li_qf_sp_asin_il?ie=UTF8&camp=1789&creative=9325&creativeASIN=1449370780&linkCode=as2&tag=greenteapre01-20"><img border="0" src="http://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&amp;ASIN=1449370780&amp;Format=_SL160_&amp;ID=AsinImage&amp;MarketPlace=US&amp;ServiceVersion=20070822&amp;WS=1&amp;tag=greenteapre01-20" /></a><img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1449370780" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
17+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1491938455/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491938455&linkCode=as2&tag=greenteapre01-20&linkId=CTV7PDT7E5EGGJUM">
18+
<img border="0" src="http://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=1491938455&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=greenteapre01-20"></a>
19+
<img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491938455" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;">
1720

1821
<p>
19-
<a rel="nofollow" href="http://www.amazon.com/gp/product/1491939362/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491939362&linkCode=as2&tag=greenteapre01-20&linkId=FJKSQ3IHEMY2F2VA">Think Python 2e</a><img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491939362" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
22+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1491929561/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491929561&linkCode=as2&tag=greenteapre01-20&linkId=ZY6MAYM33ZTNSCNZ">Think Java</a>
23+
<img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491929561" width="1" height="1" border="0" alt="">
2024

25+
<p>
26+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1491929561/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491929561&linkCode=as2&tag=greenteapre01-20&linkId=PT77ANWARUNNU3UK">
27+
<img border="0" src="http://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=1491929561&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=greenteapre01-20"></a>
28+
<img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491929561" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;">
29+
30+
<p>
31+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1449370780/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1449370780&linkCode=as2&tag=greenteapre01-20">Think Bayes</a>
32+
<img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1449370780" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
2133

2234
<p>
23-
<a rel="nofollow" href="http://www.amazon.com/gp/product/1491939362/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491939362&linkCode=as2&tag=greenteapre01-20&linkId=ZZ454DLQ3IXDHNHX"><img border="0" src="http://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=1491939362&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=greenteapre01-20" ></a><img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491939362" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
35+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1449370780/ref=as_li_qf_sp_asin_il?ie=UTF8&camp=1789&creative=9325&creativeASIN=1449370780&linkCode=as2&tag=greenteapre01-20">
36+
<img border="0" src="http://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&amp;ASIN=1449370780&amp;Format=_SL160_&amp;ID=AsinImage&amp;MarketPlace=US&amp;ServiceVersion=20070822&amp;WS=1&amp;tag=greenteapre01-20" /></a>
37+
<img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1449370780" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
2438

2539
<p>
26-
<a href="http://www.amazon.com/gp/product/1491907339/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491907339&linkCode=as2&tag=greenteapre01-20&linkId=O7WYM6H6YBYUFNWU">Think Stats 2e</a><img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491907339" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
40+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1491939362/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491939362&linkCode=as2&tag=greenteapre01-20&linkId=FJKSQ3IHEMY2F2VA">Think Python 2e</a>
41+
<img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491939362" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
2742

2843
<p>
29-
<a href="http://www.amazon.com/gp/product/1491907339/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491907339&linkCode=as2&tag=greenteapre01-20&linkId=JVSYKQHYSUIEYRHL"><img border="0" src="http://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&amp;ASIN=1491907339&amp;Format=_SL160_&amp;ID=AsinImage&amp;MarketPlace=US&amp;ServiceVersion=20070822&amp;WS=1&amp;tag=greenteapre01-20" /></a><img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491907339" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
44+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1491939362/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491939362&linkCode=as2&tag=greenteapre01-20&linkId=ZZ454DLQ3IXDHNHX">
45+
<img border="0" src="http://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=1491939362&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=greenteapre01-20" ></a>
46+
<img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491939362" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
3047

3148
<p>
32-
<a href="http://www.amazon.com/gp/product/1449314635/ref=as_li_tf_tl?ie=UTF8&tag=greenteapre01-20&linkCode=as2&camp=1789&creative=9325&creativeASIN=1449314635">Think Complexity</a><img src="http://www.assoc-amazon.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1449314635" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
49+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1491907339/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491907339&linkCode=as2&tag=greenteapre01-20&linkId=O7WYM6H6YBYUFNWU">Think Stats 2e</a>
50+
<img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491907339" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
3351

3452
<p>
35-
<a href="http://www.amazon.com/gp/product/1449314635/ref=as_li_tf_il?ie=UTF8&camp=1789&creative=9325&creativeASIN=1449314635&linkCode=as2&tag=greenteapre01-20"><img border="0" src="http://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&amp;ASIN=1449314635&amp;Format=_SL160_&amp;ID=AsinImage&amp;MarketPlace=US&amp;ServiceVersion=20070822&amp;WS=1&amp;tag=greenteapre01-20" /></a><img src="http://www.assoc-amazon.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1449314635" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
53+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1491907339/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491907339&linkCode=as2&tag=greenteapre01-20&linkId=JVSYKQHYSUIEYRHL">
54+
<img border="0" src="http://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&amp;ASIN=1491907339&amp;Format=_SL160_&amp;ID=AsinImage&amp;MarketPlace=US&amp;ServiceVersion=20070822&amp;WS=1&amp;tag=greenteapre01-20" /></a>
55+
<img src="http://ir-na.amazon-adsystem.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1491907339" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
3656

57+
<p>
58+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1449314635/ref=as_li_tf_tl?ie=UTF8&tag=greenteapre01-20&linkCode=as2&camp=1789&creative=9325&creativeASIN=1449314635">Think Complexity</a>
59+
<img src="http://www.assoc-amazon.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1449314635" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
60+
61+
<p>
62+
<a rel="nofollow" href="http://www.amazon.com/gp/product/1449314635/ref=as_li_tf_il?ie=UTF8&camp=1789&creative=9325&creativeASIN=1449314635&linkCode=as2&tag=greenteapre01-20">
63+
<img border="0" src="http://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&amp;ASIN=1449314635&amp;Format=_SL160_&amp;ID=AsinImage&amp;MarketPlace=US&amp;ServiceVersion=20070822&amp;WS=1&amp;tag=greenteapre01-20" /></a>
64+
<img src="http://www.assoc-amazon.com/e/ir?t=greenteapre01-20&l=as2&o=1&a=1449314635" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
3765

3866
</td>
3967
</tr>

‎header.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,10 @@
55
<td valign="top" width="100" bgcolor="#542889" style="padding: 0px 10px;">
66
</td>
77

8-
<td valign="top" width="600" style="padding: 0px 10px;">
8+
<td valign="top" width="600" style="padding: 10px;">
99

10+
<p>This HTML version of <i>Think Java</i> is provided for convenience, but it is not the best format of the book.
11+
In particular, some of the symbols are not rendered correctly.</p>
12+
13+
<p>You might prefer to read the <a href="../thinkjava.pdf">PDF version</a>, or you can buy a hardcopy at
14+
<a href="http://www.amazon.com/gp/product/1491929561/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1491929561&linkCode=as2&tag=greenteapre01-20">Amazon</a>.

‎htmlonly‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
\usepackage{hevea}
2-
31
\newcommand{\adjustpage}[1]{}
42

53
\newcommand{\clearemptydoublepage}{}
@@ -17,6 +15,8 @@
1715

1816
\newcommand{\vfill}{}
1917

18+
\newcommand{\href}{\ahref}
19+
2020
\htmlhead{\rawhtmlinput{header.html}}
2121

2222
\htmlfoot{\rawhtmlinput{footer.html}}

‎latexonly‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@
118118
% pdf hyperlinks, table of contents, and document properties
119119
\usepackage{hyperref}
120120
\hypersetup{%
121-
pdftitle={\thetitle},
121+
pdftitle={\thetitle: \thesubtitle},
122122
pdfauthor={\theauthors},
123-
pdfsubject={\theversion},
123+
pdfsubject={Version \theversion},
124124
pdfkeywords={},
125125
bookmarksopen=false,
126126
colorlinks=true,

‎thinkjava.tex‎

Lines changed: 86 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@
33
\title{Think Java}
44
\author{Allen B. Downey and Chris Mayfield}
55

6-
\newcommand{\thetitle}{Think Java: How to Think Like a Computer Scientist}
6+
\newcommand{\thetitle}{Think Java}
7+
\newcommand{\thesubtitle}{How to Think Like a Computer Scientist}
78
\newcommand{\theauthors}{Allen B. Downey and Chris Mayfield}
8-
\newcommand{\theversion}{Version 6.0.4}
9+
\newcommand{\theversion}{6.1.0}
910

1011
%%%% Both LATEX and PLASTEX
1112

1213
\usepackage{graphicx}
13-
14+
\usepackage{hevea}
1415
\usepackage{makeidx}
16+
\usepackage{setspace}
17+
1518
\makeindex
1619

1720
% automatically index glossary terms
1821
\newcommand{\term}[1]{%
19-
\index{#1}
20-
\item[#1:]}
22+
\item[#1:]\index{#1}}
2123

2224
\usepackage{amsmath}
2325
\usepackage{amsthm}
@@ -69,7 +71,6 @@
6971

7072
\input{latexonly}
7173

72-
%%%% END OF LATEX ONLY
7374
\fi
7475

7576
%%%% END OF PREAMBLE
@@ -85,52 +86,113 @@
8586
%%%% LATEX ONLY
8687
\else
8788

88-
%--title page--------------------------------------------------
89-
\pagebreak
89+
\begin{latexonly}
90+
91+
%--half title-------------------------------------------------
92+
\thispagestyle{empty}
93+
94+
\begin{flushright}
95+
\vspace*{2.0in}
96+
97+
\begin{spacing}{3}
98+
{\huge \thetitle} \\
99+
{\Large \thesubtitle}
100+
\end{spacing}
101+
102+
\vspace{0.25in}
103+
104+
Version \theversion
105+
106+
\vfill
107+
\end{flushright}
108+
109+
%--verso------------------------------------------------------
110+
\newpage
111+
\thispagestyle{empty}
112+
113+
\quad
114+
115+
%--title page-------------------------------------------------
116+
\newpage
90117
\thispagestyle{empty}
91118

92119
\begin{flushright}
93120
\vspace*{2.0in}
94121

95-
{\huge Think Java}
122+
\begin{spacing}{3}
123+
{\huge \thetitle} \\
124+
{\Large \thesubtitle}
125+
\end{spacing}
96126

97127
\vspace{0.25in}
98-
{\LARGE How to Think Like a Computer Scientist}
128+
129+
Version \theversion
99130

100131
\vspace{1in}
132+
101133
{\Large \theauthors}
102134

103-
\vspace{1in}
104-
{\large \theversion}
135+
\vspace{0.5in}
105136

106-
\vfill
137+
{\Large Green Tea Press}
138+
139+
{\small Needham, Massachusetts}
107140

141+
\vfill
108142
\end{flushright}
109143

110144
%--copyright--------------------------------------------------
111-
\pagebreak
145+
\newpage
112146
\thispagestyle{empty}
113147

114-
Copyright \copyright ~2016 Allen B. Downey and Chris Mayfield.
148+
Copyright \copyright ~2016 \theauthors.
115149

116-
%{\bf NOTE: This version of the book is a work in progress and won't be completed until March 2016.}
150+
\vspace{0.2in}
117151

118-
\vspace{0.25in}
152+
\begin{flushleft}
153+
Green Tea Press \\
154+
9 Washburn Ave \\
155+
Needham, MA 02492
156+
\end{flushleft}
119157

120-
Permission is granted to copy, distribute, transmit, and adapt this work under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License: \url{http://creativecommons.org/licenses/by-nc-sa/3.0/}.
158+
Permission is granted to copy, distribute, and/or modify this work under the Creative Commons Attribution-NonCommercial 3.0 Unported License, which is available at \url{http://creativecommons.org/licenses/by-nc/3.0/}.
121159

122160
The original form of this book is \LaTeX\ source code.
123-
Compiling the \LaTeX\ source has the effect of generating a device-independent representation of the book, which can be converted to other formats and printed.
161+
Compiling this code has the effect of generating a device-independent representation of the book, which can be converted to other formats and printed.
124162

125163
The \LaTeX\ source for this book is available from \url{http://thinkjava.org}.
126-
%-----------------------------------------------------------------
127164

128-
% table of contents
165+
%--table of contents------------------------------------------
166+
129167
\cleardoublepage
130168
\setcounter{tocdepth}{1}
131169
\tableofcontents
132170

133-
%%%% END OF LATEX ONLY
171+
\end{latexonly}
172+
173+
%--HTML title page--------------------------------------------
174+
175+
\begin{htmlonly}
176+
177+
{\Large \thetitle: \thesubtitle}
178+
179+
{\large \theauthors}
180+
181+
Version \theversion
182+
183+
\vspace{0.25in}
184+
185+
Copyright \copyright ~2016 \theauthors.
186+
187+
\vspace{0.25in}
188+
189+
Permission is granted to copy, distribute, and/or modify this work under the Creative Commons Attribution-NonCommercial 3.0 Unported License, which is available at \url{http://creativecommons.org/licenses/by-nc/3.0/}.
190+
191+
\end{htmlonly}
192+
193+
%-------------------------------------------------------------
194+
195+
% END OF THE PART WE SKIP FOR PLASTEX
134196
\fi
135197

136198

@@ -11822,7 +11884,7 @@ \section{Vocabulary}
1182211884
The ``Abstract Window Toolkit'', a Java package for creating graphical user interfaces.
1182311885

1182411886
\term{coordinate}
11825-
A variable or value that specifies a location in a two-dimensional graphical window.
11887+
A value that specifies a location in a two-dimensional graphical window.
1182611888

1182711889
\term{pixel}
1182811890
The unit in which coordinates are measured.
@@ -11885,7 +11947,7 @@ \section{Exercises}
1188511947

1188611948
\begin{figure}[!ht]
1188711949
\begin{center}
11888-
\includegraphics[height=1.5in]{figs/moire.pdf}
11950+
\includegraphics[height=2in]{figs/moire.pdf}
1188911951
\caption{Graphical patterns that can exhibit Moir\'{e} interference.}
1189011952
\label{fig.moire}
1189111953
\end{center}

0 commit comments

Comments
 (0)