Revert changes related to Chinese text

marijnh · marijnh · commit 2c07463b499a · 2018-02-14T23:25:22.000+01:00
So that it looks readable again Issue marijnh#327
diff --git a/02_program_structure.md b/02_program_structure.md
@@ -910,7 +910,7 @@ If you are unsure how to try your solutions to exercises, refer to the
 Each exercise starts with a problem description. Read that and try to
 solve the exercise. If you run into problems, consider reading the
 hints [after the exercise]{if interactive}[at the [end of the
-book](hints.html#hints)]{if book}. Full solutions to the exercises are
+book](hints)]{if book}. Full solutions to the exercises are
 not included in this book, but you can find them online at
 [_eloquentjavascript.net/code_](http://eloquentjavascript.net/code).
 If you want to learn something from the exercises, I recommend looking
diff --git a/04_data.md b/04_data.md
@@ -60,8 +60,8 @@ That takes care of the cat and tree problems. But Jacques would prefer
 to get rid of his condition entirely. The irregular occurrences of the
 transformation make him suspect that they might be triggered by
 something. For a while, he believed that it happened only on days when
-he had been near oak trees. But avoiding oak trees did not cause the
-problem to stop.
+he had been near oak trees. But avoiding oak trees did not stop the
+problem.
 
 {{index journal}}
 
@@ -78,8 +78,8 @@ information.
 {{index "data structure"}}
 
 To work with a chunk of digital data, we'll first have to find a way
-to represent it in our machine's ((memory)). Say, as an example, that
-we want to represent a ((collection)) of numbers: 2, 3, 5, 7, and 11.
+to represent it in our machine's ((memory)). Say, for example, that we
+want to represent a ((collection)) of the numbers 2, 3, 5, 7, and 11.
 
 {{index string}}
 
@@ -116,9 +116,9 @@ _((index))_ given by the expression in the brackets.
 {{index "zero-based counting"}}
 
 The first index of an array is zero, not one. So the first element is
-read with `listOfNumbers[0]`. This convention takes some getting used
-to. Zero-based counting has a long tradition in technology, and in
-certain ways makes a lot of sense. Think of the index as the amount of
+retrieved with `listOfNumbers[0]`. Zero-based counting has a long
+tradition in technology, and in certain ways makes a lot of sense, but
+it takes some getting used to. Think of the index as the amount of
 items to skip, counting from the start of the array.
 
 {{id properties}}
@@ -129,11 +129,11 @@ items to skip, counting from the start of the array.
 
 We've seen a few suspicious-looking expressions like `myString.length`
 (to get the length of a string) and `Math.max` (the maximum function)
-in past examples. These are expressions that access a _((property))_
+in past chapters. These are expressions that access a _((property))_
 of some value. In the first case, we access the `length` property of
 the value in `myString`. In the second, we access the property named
 `max` in the `Math` object (which is a collection of
-mathematics-related values and functions).
+mathematics-related constants and functions).
 
 {{index property, null, undefined}}
 
@@ -143,13 +143,13 @@ these nonvalues, you get an error.
 
 ```{test: no}
 null.length;
-// → TypeError: Cannot read property 'length' of null
+// → TypeError: null has no properties
 ```
 
 {{indexsee "dot character", "period character"}}
 {{index "[] (subscript)", "period character", "square brackets", "computed property"}}
 
-The two main ways to access properties in JavaScript are with a dot
+The two typical ways to access properties in JavaScript are with a dot
 and with square brackets. Both `value.x` and `value[x]` access a
 ((property)) on `value`—but not necessarily the same property. The
 difference is in how `x` is interpreted. When using a dot, the word
@@ -160,10 +160,10 @@ named "x", `value[x]` tries to evaluate the expression `x` and uses
 the result as the property name.
 
 So if you know that the property you are interested in is called
-"length", you say `value.length`. If you want to extract the property
+"name", you say `value.name`. If you want to extract the property
 named by the value held in the binding `i`, you say `value[i]`.
-Property names can be any string, and the dot notation only allows
-names that look like valid binding names, so if you want to access a
+Property names can be any string, but the dot notation only works with
+names that look like valid binding names. So if you want to access a
 property named "2" or "John Doe", you must use square brackets:
 `value[2]` or `value["John Doe"]`.
 
@@ -177,9 +177,10 @@ anyway, you have to use the bracket notation to get at them.
 The `length` property of an array tells us how many elements it has.
 This property name is a valid binding name, and we know its name in
 advance, so to find the length of an array, you typically write
-`array.length` because it is easier to write than `array["length"]`.
+`array.length` because that's easier to write than `array["length"]`.
 
 {{id methods}}
+
 ## Methods
 
 {{index [function, "as property"], method, string}}
@@ -209,7 +210,7 @@ value whose property we called. How this works is described in
 [Chapter ?](object#obj_methods).
 
 Properties that contain functions are generally called _methods_ of
-the value they belong to. As in, "_toUpperCase_ is a method of a
+the value they belong to. As in, "`toUpperCase` is a method of a
 string".
 
 {{id array_methods}}
diff --git a/pdf/book.tex b/pdf/book.tex
@@ -5,6 +5,7 @@
 \usepackage{hyperref}
 \usepackage{bookmark}
 \usepackage{ucharclasses}
+\usepackage{xeCJK}
 \usepackage{fontspec}
 \usepackage{listings}
 \usepackage{graphicx}
@@ -31,21 +32,19 @@
   ^^d0^^d1^^d2^^d3^^d4^^d5^^d6^^d7^^d8^^d9^^da^^db^^dc^^dd^^de^^df%
   ^^e0^^e1^^e2^^e3^^e4^^e5^^e6^^e7^^e8^^e9^^ea^^eb^^ec^^ed^^ee^^ef%
   ^^f0^^f1^^f2^^f3^^f4^^f5^^f6^^f7^^f8^^f9^^fa^^fb^^fc^^fd^^fe^^ff%
-  🐴👟🌹🐉🍎😎🎈💥🖌💾📁🎨🦆тяв英国俄罗斯的狗说
+  🐴👟🌹🐉🍎😎🎈💥🖌💾📁🎨🦆тяв
   ^^00}
 \lst@RestoreCatcodes
 
 \setcounter{secnumdepth}{0}
 \setcounter{tocdepth}{1}
 \setmonofont[Scale=0.8]{Inconsolata.otf}
 \newfontfamily{\cyrillic}{CMU Serif}
-\defaultfontfeatures[\cjkfont]{Scale=0.55}
-\newfontfamily{\cjkfont}{FandolSong}
-\defaultfontfeatures[\emojifont]{Scale=1.15,FakeBold=1.25}
+\defaultfontfeatures[\emojifont]{Scale=1.15}
 \newfontface{\emojifont}{Symbola_hint.ttf}
 \setTransitionsFor{MiscellaneousSymbolsAndPictographs}{\emojifont}{\normalfont}{}
 \setTransitionsForCyrillics{\cyrillic}{}
-\setTransitionsForCJK{\cjkfont}{}
+\setTransitionsFor{CJK}{\emojifont}{}
 \pagestyle{plain}
 \makeatother
 
