Fix various LaTeX issues around quote blocks and special characters

marijnh · marijnh · commit 1ed79b353672 · 2014-07-18T13:01:59.000+02:00
diff --git a/02_program_structure.txt b/02_program_structure.txt
@@ -4,6 +4,7 @@
 
 = Program Structure =
 
+[chapterquote="true"]
 [quote, _why, Why's (Poignant) Guide to Ruby]
 ____
 And my heart glows bright red under my filmy, translucent skin and
diff --git a/03_functions.txt b/03_functions.txt
@@ -4,6 +4,7 @@
 
 = Functions =
 
+[chapterquote="true"]
 [quote, Donald Knuth]
 ____
 People think that computer science is the art of geniuses but the
diff --git a/04_data.txt b/04_data.txt
@@ -5,6 +5,7 @@
 
 = Data Structures: Objects and Arrays =
 
+[chapterquote="true"]
 [quote, Charles Babbage, Passages from the Life of a Philosopher (1864)]
 ____
 On two occasions I have been asked, ‘Pray, Mr. Babbage, if you put
@@ -446,7 +447,7 @@ number of times the various combinations of the two variables were
 observed. For example, we could take the event of eating pizza and
 put that in a table like this:
 
-image::img/pizza-squirrel.svg[alt="Eating pizza versus turning into a squirrel",width="8cm"]
+image::img/pizza-squirrel.svg[alt="Eating pizza versus turning into a squirrel",width="7cm"]
 
 _ϕ_ can be computed using the following formula, where n refers to the table:
 
@@ -469,22 +470,22 @@ endif::html_target[]
 
 ifdef::tex_target[]
 
-latexmath:[\phi = \frac{n_{11}n_{00}-n_{10}n_{01}}{\sqrt{n_{1\bullet}n_{0\bullet}n_{\bullet1}n_{\bullet0}}}]
+pass:[\begin{equation}\phi = \frac{n_{11}n_{00}-n_{10}n_{01}}{\sqrt{n_{1\bullet}n_{0\bullet}n_{\bullet1}n_{\bullet0}}}\end{equation}]
 
 endif::tex_target[]
 
-The notation _n_~01~ indicates the number of measurements where the first
+The notation (!html _n_~01~!)(!tex pass:[$n_{01}$]!) indicates the number of measurements where the first
 measurement (pizza) is false (0) and the second measurement (squirrelness) is
-true (1). In this example, _n_~01~ is 4.
+true (1). In this example, (!html _n_~01~!)(!tex pass:[$n_{01}$]!) is 4.
 
-The value _n_~1•~ refers to the sum of all
+The value (!html _n_~1•~!)(!tex pass:[$n_{1\bullet}$]!) refers to the sum of all
 measurements where the first variable is true, which is 10 in the
-example table. Likewise, _n_~•0~ refers to the sum of the measurements where
+example table. Likewise, (!html _n_~•0~!)(!tex pass:[$n_{\bullet0}$]!) refers to the sum of the measurements where
 the squirrel variable is false.
 
 So for the pizza table, the part above the division line (the dividend)
 would be 1×76 - 9×4 = 40, and the part below it (the divisor) would be the
-square root of 10×80×5×85, or √340000. This comes out to _ϕ_ ≈ 0.069. This
+square root of 10×80×5×85, or (!html √340000!)(!tex pass:[$\sqrt{340000}$]!). This comes out to _ϕ_ ≈ 0.069, which
 is tiny. Eating pizza does not appear to have influence on the
 transformations.
 
@@ -526,12 +527,12 @@ console.log(phi([76, 9, 4, 1]));
 (((square root)))(((sqrt function)))This is simply a direct translation
 of the _phi_ formula into JavaScript. `Math.sqrt` is the square root function,
 as provided by the `Math` object in a standard JavaScript environment.
-We have to sum two fields from the table to get fields like n~1•~
+We have to sum two fields from the table to get fields like (!html n~1•~!)(!tex pass:[$n_{1\bullet}$]!)
 because the sums of rows or columns are not stored directly in our
 data structure.
 
 Jacques kept his journal for three months. The resulting data set is
-available in the coding sandbox for this chapter!!tex  (`eloquentjavascript.net/code`)!!,
+available in the coding sandbox for this chapter(!tex  (`eloquentjavascript.net/code`)!),
 where it is stored
 in the `JOURNAL` variable, and in a downloadable
 http://eloquentjavascript.net/code/jacques_journal.js[file].
diff --git a/05_higher_order.txt b/05_higher_order.txt
@@ -5,6 +5,9 @@
 
 = Higher-Order Functions =
 
+ifdef::html_target[]
+
+[chapterquote="true"]
 [quote, Master Yuan-Ma, The Book of Programming]
 ____
 Tzu-li and Tzu-ssu were boasting about the size of their latest
@@ -14,6 +17,9 @@ already.' Master Yuan-Ma said, 'My best program has five hundred
 lines.' Hearing this, Tzu-li and Tzu-ssu were enlightened.
 ____
 
+endif::html_target[]
+
+[chapterquote="true"]
 [quote, C.A.R. Hoare, 1980 ACM Turing Award Lecture]
 ____
 There are two ways of constructing a software design: One way is to
@@ -407,7 +413,7 @@ console.log(JSON.parse(string).born);
 The variable `ANCESTRY_FILE`, available in the sandbox for this
 chapter as well as in
 http://eloquentjavascript.net/code/ancestry.js[a downloadable file] on
-the website!!tex  (`eloquentjavascript.net/code`)!!,
+the website(!tex  (`eloquentjavascript.net/code`)!),
 contains the content of my JSON file as a string. Let's decode it and
 see how many people it contains:
 
diff --git a/06_object.txt b/06_object.txt
@@ -5,6 +5,7 @@
 
 = The Secret Life of Objects =
 
+[chapterquote="true"]
 [quote, Joe Armstrong, interviewed in Coders at Work]
 ____
 The problem with object-oriented languages is they’ve got all this
@@ -716,7 +717,7 @@ anything interesting.
 The source data for the table of mountains that we are trying to build
 is available in the `MOUNTAINS` variable in the sandbox, and also
 http://eloquentjavascript.net/code/mountains.js[downloadable] from the
-list of data sets on the website!!tex  (`eloquentjavascript.net/code`)!!.
+list of data sets on the website(!tex  (`eloquentjavascript.net/code`)!).
 
 We will want to highlight the top row, which contains the column
 names, by underlining the cells with a series of dash characters. No
@@ -1059,7 +1060,7 @@ done with the `Object.defineProperty` function. To compute the
 distance from (0, 0) to (x, y), you can use the Pythagorean theorem, which
 says that the square of the distance we are looking for is equal to
 the square of the x coordinate plus the square of the y coordinate.
-Thus √(x^2^ + y^2^) is the number you want, and `Math.sqrt` is the way
+Thus (!html √(x^2^ + y^2^)!)(!tex pass:[$\sqrt{x^2 + y^2}$]!) is the number you want, and `Math.sqrt` is the way
 you compute a square root in JavaScript.
 
 !!solution!!
diff --git a/07_elife.txt b/07_elife.txt
@@ -5,6 +5,7 @@
 
 = Project: Electronic Life =
 
+[chapterquote="true"]
 [quote, Edsger Dijkstra, The Threats to Computing Science]
 ____
 [...] the question of whether Machines Can Think [...] is about as
@@ -969,8 +970,8 @@ var valley = new LifelikeWorld(
 );
 ----
 
-Let's see what happens if we run this. !!tex These snapshots
-illustrate a typical run of this world.!!
+Let's see what happens if we run this. (!tex These snapshots
+illustrate a typical run of this world.!)
 
 ifdef::html_target[]
 
diff --git a/08_error.txt b/08_error.txt
@@ -5,13 +5,17 @@
 
 = Bugs and Error Handling =
 
+[chapterquote="true"]
 [quote, Brian Kernighan and P.J. Plauger, The Elements of Programming Style]
 ____
 Debugging is twice as hard as writing the code in the first place.
 Therefore, if you write the code as cleverly as possible, you are, by
 definition, not smart enough to debug it.
 ____
 
+ifdef::html_target[]
+
+[chapterquote="true"]
 [quote, Master Yuan-Ma, The Book of Programming]
 ____
 Yuan-Ma had written a small program that used many global variables
@@ -21,6 +25,8 @@ this be?’ The master said, ‘There is no need to fetch a water hose
 when the house is not on fire.’
 ____
 
+endif::html_target[]
+
 (((error handling)))A program is crystallized thought. Sometimes those
 thoughts are confused. Other times, mistakes are introduced when
 setting thought into code. Either way, the result is a
diff --git a/09_regexp.txt b/09_regexp.txt
@@ -4,19 +4,25 @@
 
 = Regular Expressions =
 
+[chapterquote="true"]
 [quote,Jamie Zawinski]
 ____
 Some people, when confronted with a problem, think ‘I know, I'll use
 regular expressions.’ Now they have two problems.
 ____
 
+ifdef::html_target[]
+
+[chapterquote="true"]
 [quote, Master Yuan-Ma, The Book of Programming]
 ____
 Yuan-Ma said, ‘When you cut against the grain of the wood, much
 strength is needed. When you program against the grain of a problem,
 much code is needed.’
 ____
 
+endif::html_target[]
+
 Programming tools and techniques survive and spread
 in a chaotic, evolutionary way. It's not always the pretty or
 brilliant ones that win, but rather the ones that function
diff --git a/10_modules.txt b/10_modules.txt
@@ -5,6 +5,9 @@
 
 = Modules =
 
+ifdef::html_target[]
+
+[chapterquote="true"]
 [quote, Master Yuan-Ma, The Book of Programming]
 ____
 A beginning programmer writes her programs like an ant builds her
@@ -22,6 +25,8 @@ things in their simple form. Her programs are like clay, solid yet
 malleable.
 ____
 
+endif::html_target[]
+
 Every program has a shape. On a small scale, this shape is determined
 by its division into functions, and the blocks inside those functions.
 Programmers have a lot of freedom in the shape they give their
diff --git a/11_language.txt b/11_language.txt
@@ -5,18 +5,24 @@
 
 = Project: A Programming Language =
 
+[chapterquote="true"]
 [quote, Hal Abelson and Gerald Sussman, Structure and Interpretation of Computer Programs]
 ____
 The evaluator, which determines the meaning of expressions in a
 programming language, is just another program.
 ____
 
+ifdef::html_target[]
+
+[chapterquote="true"]
 [quote, Master Yuan-Ma, The Book of Programming]
 ____
 When a student asked the master about the nature of the cycle of Data
 and Control, Yuan-Ma replied ‘Think of a compiler, compiling itself.’
 ____
 
+endif::html_target[]
+
 Building your own programming language is surprisingly easy (as long as
 you do not aim too high) and very enlightening.
 
diff --git a/12_browser.txt b/12_browser.txt
@@ -4,6 +4,7 @@
 
 = JavaScript and the Browser =
 
+[chapterquote="true"]
 [quote,Douglas Crockford,The JavaScript Programming Language (video lecture)]
 ____
 The browser is a really hostile programming environment.
diff --git a/13_dom.txt b/13_dom.txt
@@ -5,13 +5,6 @@
 
 = The Document Object Model =
 
-[quote,Le Hors et al,Document Object Model Core]
-____
-While it would be nice to have attribute and method names that are
-short [...] DOM names tend to be long and descriptive in order to be
-unique across all environments.
-____
-
 When you open a web page in your browser, it will retrieve the page's
 HTML text, and parse it much like our parser from Chapter 11 parses
 programs, building up a model of its structure. It will then use this
@@ -894,7 +887,7 @@ regular cells (`<td>`).
 The same source data that was used in Chapter 6 is again available in
 the `MOUNTAINS` variable in the sandbox, and also
 http://eloquentjavascript.net/code/mountains.js[downloadable] from the
-list of data sets on the website!!tex (`eloquentjavascript.net/code`)!!.
+list of data sets on the website(!tex (`eloquentjavascript.net/code`)!).
 
 Write a function `buildTable` that, given an array of objects (which
 all have the same set of properties), builds up a DOM structure
diff --git a/14_event.txt b/14_event.txt
@@ -4,6 +4,7 @@
 
 = Handling Events =
 
+[chapterquote="true"]
 [quote,Marcus Aurelius,Meditations]
 ____
 You have power over your mind—not outside events. Realize this, and
diff --git a/15_game.txt b/15_game.txt
@@ -27,7 +27,7 @@ viewed from the side, jumping onto and over things.
 == The game ==
 
 Our game will be roughly based on “http://www.lessmilk.com/games/10[Dark
-Blue]”!!tex (_www.lessmilk.com/games/10_)!! by Thomas Palef. I chose
+Blue]”(!tex (_www.lessmilk.com/games/10_)!) by Thomas Palef. I chose
 this game because it is extremely minimal (and thus implementable
 without _too_ much code), yet entertaining. It looks like this:
 
@@ -1140,7 +1140,7 @@ such as network requests in Chapter 17, and in- and output in general
 in Chapter 20.
 
 There is a set of level plans available in the `GAME_LEVELS` variable
-!!tex (downloadable from `eloquentjavascript.net/code`)!!. This page
+(!tex (downloadable from `eloquentjavascript.net/code`)!). This page
 feeds them to `runGame`, starting an actual game:
 
 [sandbox="null"]
diff --git a/16_canvas.txt b/16_canvas.txt
@@ -5,6 +5,7 @@
 
 = Drawing on Canvas =
 
+[chapterquote="true"]
 [quote,M.C. Escher,cited by Bruno Ernst in The Magic Mirror of M.C. Escher]
 ____
 Drawing is deception
@@ -1337,7 +1338,7 @@ create a round ball, start a path, call ++arc(x, y, radius, 0, 7)++—an
 arc going from zero to more than a whole circle—and fill it.
 
 To model the ball's position and speed, you can use the `Vector` type
-from Chapter 15!!html  (which is available on this page)!!. Give it a
+from Chapter 15(!html  (which is available on this page)!). Give it a
 starting speed, preferably one that is not purely vertical or
 horizontal, and every frame, multiply that speed with the amount of
 time that elapsed. When the ball gets too close to a vertical wall,
diff --git a/17_http.txt b/17_http.txt
@@ -5,6 +5,7 @@
 
 = HTTP =
 
+[chapterquote="true"]
 [quote,Tim Berners-Lee,The World Wide Web: A very short personal history]
 ____
 The dream behind the Web is of a common information space in which we
diff --git a/18_forms.txt b/18_forms.txt
@@ -5,6 +5,7 @@
 
 = Forms and Form Fields =
 
+[chapterquote="true"]
 [quote,Mephistopheles,in Goethe's Faust]
 ____
 I shall this very day, at Doctor's feast, + 
diff --git a/19_paint.txt b/19_paint.txt
@@ -304,7 +304,7 @@ default type of an `<input>` tag is `"text"`, and when an unsupported
 type is found, browsers will treat it as a text field. That means that
 Internet Explorer users running our paint program will have to type in
 the name of the color they want, rather than select it from a
-convenient widget.!!tex  This is what it may look like:!!
+convenient widget.(!tex  This is what it may look like:!)
 
 ifdef::tex_target[]
 
@@ -615,8 +615,8 @@ point, the dots are not distributed uniformly, but more likely to
 appear near the center of the circle. There are ways around this, but
 they are more complicated than the loop above.
 
-We now have a functioning paint program.!!html  Run the code below to
-try it out.!!
+We now have a functioning paint program.(!html  Run the code below to
+try it out.!)
 
 ifdef::html_target[]
 
diff --git a/20_node.txt b/20_node.txt
@@ -4,6 +4,7 @@
 
 = Node.js =
 
+[chapterquote="true"]
 [quote, Master Yuan-Ma, The Book of Programming]
 ____
 A student asked ‘The programmers of old used only simple machines and
diff --git a/21_skillsharing.txt b/21_skillsharing.txt
@@ -24,9 +24,9 @@ meetings moved to another town, nobody stepped forward to take over
 this task. We want a system that will let the participants propose and
 discuss talks among themselves, without a central organizer.
 
-!!html Just like in the previous chapter, the code in this chapter is
+(!html Just like in the previous chapter, the code in this chapter is
 written for Node.js, and running it directly in the HTML page that you
-are looking at is unlikely to work. !!The full code for the project
+are looking at is unlikely to work. !)The full code for the project
 can be downloaded from
 http://eloquentjavascript.net/code/skillsharing.zip[_eloquentjavascript.net/code/skillsharing.zip_].
 
diff --git a/Makefile b/Makefile
@@ -33,7 +33,11 @@ test: html
 	@! grep '[a-zA-Z0-9]_[—“”‘’]\|[—“”‘’]_[a-zA-Z0-9]\|[a-zA-Z0-9]`—\|[a-zA-Z0-9]`[a-zA-Z0-9]' *.txt
 	@echo Done.
 
-book.pdf: $(foreach CHAP,$(CHAPTERS),tex/$(CHAP).tex)
+book.pdf: tex/book/book.tex $(foreach CHAP,$(CHAPTERS),tex/$(CHAP).tex)
 	cd tex/book && xelatex book.tex
 	cd tex/book && xelatex book.tex
 	mv tex/book/book.pdf .
+
+pdfonce:
+	cd tex/book && xelatex book.tex
+	mv tex/book/book.pdf .
diff --git a/asciidoc_html.conf b/asciidoc_html.conf
diff --git a/asciidoc_latex.conf b/asciidoc_latex.conf
diff --git a/bin/clean_latex.js b/bin/clean_latex.js
diff --git a/tex/book/book.tex b/tex/book/book.tex
