Merge branch 'master' into 3-3-3-bug

javascript/latexContent.js

@@ -887,7 +887,7 @@ export const ending = `
 %\\shipoutAnswer
 
 \\newpage
-\\markboth{References}{References}
+\\renewcommand{\\chaptermark}[1]{\\markboth{References}{References}}
 \\input{./others/97references97.tex}
 
 \\newpage

package.json

@@ -25,9 +25,9 @@
   },
   "homepage": "https://sourceacademy.org/sicpjs",
   "devDependencies": {
-    "@babel/node": "^7.24.6",
-    "@babel/core": "^7.24.6",
-    "@babel/preset-env": "^7.24.6",
+    "@babel/node": "^7.24.7",
+    "@babel/core": "^7.24.7",
+    "@babel/preset-env": "^7.24.7",
     "fs-extra": "^11.2.0",
     "http-server": "^14.1.1",
     "husky": "^8.0.3",

xml/chapter1/section1/subsection6.xml

@@ -231,7 +231,9 @@ abs(-5);
         <META>alternative-expression</META> and returns its value as the value of the
 	conditional.<FOOTNOTE>
 	<INDEX>conditional expression<SUBINDEX>non-boolean value as predicate</SUBINDEX></INDEX>
-	Conditionals in full JavaScript accept any value, not just a boolean, as the result of evaluating
+	Conditionals
+	<LABEL NAME="foot:any-value-as-predicate"/>
+	in full JavaScript accept any value, not just a boolean, as the result of evaluating
 	the <META>predicate</META> expression (see footnote<SPACE/><REF NAME="foot:truthy"/>
 	in section<SPACE/><REF NAME="sec:eval-data-structures"/> for details). The programs in this book
 	use only boolean values as predicates of conditionals.
@@ -591,8 +593,10 @@ $\vdots$
             <INDEX>evaluation<SUBINDEX>of <JAVASCRIPTINLINE>&amp;&amp;</JAVASCRIPTINLINE><ORDER>of ;1</ORDER></SUBINDEX><FRAGILE/></INDEX>
 	    <EM>logical conjunction</EM>, meaning roughly 
 	    the same as the English word <QUOTE>and.</QUOTE>
-	    This syntactic form is syntactic sugar<FOOTNOTE>
-            Syntactic forms that are simply convenient
+	    We assume<FOOTNOTE>This assumption is justified by the restriction mentioned
+	    in footnote<SPACE/><REF NAME="foot:any-value-as-predicate"/>. Full JavaScript
+	    needs to consider the case where the result of evaluating <META>expression</META><LATEXINLINE>$_1$</LATEXINLINE> is neither true nor false.</FOOTNOTE> this syntactic form to be syntactic
+	    sugar<FOOTNOTE>Syntactic forms that are simply convenient
             alternative surface structures for things that can be written in more
             uniform ways are sometimes called <EM>syntactic sugar</EM>, to use a
             phrase coined by 
@@ -617,7 +621,7 @@ $\vdots$
             <INDEX>evaluation<SUBINDEX>of {\tt "|"|}<ORDER>of ;2</ORDER></SUBINDEX><FRAGILE/></INDEX>
 	    <EM>logical disjunction</EM>, meaning roughly
 	    the same as the English word <QUOTE>or.</QUOTE>
-	    This syntactic form is syntactic sugar for<BR/>
+	    We assume this syntactic form to be syntactic sugar for<BR/>
 	    <META>expression</META><LATEXINLINE>$_1$</LATEXINLINE> <JAVASCRIPTINLINE>?</JAVASCRIPTINLINE>
 	    <JAVASCRIPTINLINE>true</JAVASCRIPTINLINE> <JAVASCRIPTINLINE>:</JAVASCRIPTINLINE>
 	    <META>expression</META><LATEXINLINE>$_2$</LATEXINLINE>.

xml/chapter1/section1/subsection7.xml

@@ -708,23 +708,21 @@ function sqrt_iter(guess, x) {
         <REQUIRES>sqrt</REQUIRES>
         <REQUIRES>improve</REQUIRES>
         <REQUIRES>sqrt_iter</REQUIRES>	
+        <REQUIRES>square_definition</REQUIRES>	
 	<EXAMPLE>example_1.8</EXAMPLE>
 	<JAVASCRIPT>
-const error_threshold = 0.01;
+const relative_tolerance = 0.0001;
 function is_good_enough(guess, x) {
-    return relative_error(guess, improve(guess, x))
-           &lt; error_threshold;
-}
-function relative_error(estimate, reference) {
-    return abs(estimate - reference) / reference;
+    return abs(square(guess) - x) &lt; guess * relative_tolerance;
 }
 	</JAVASCRIPT>
       </SNIPPET>
     </SOLUTION>
     <SNIPPET HIDE="yes">
       <NAME>example_1.8</NAME>
       <JAVASCRIPT>
-sqrt(3);
+display(sqrt(0.0001));
+display(sqrt(4000000000000));
       </JAVASCRIPT>
       <SCHEME>
       </SCHEME>

xml/chapter2/section2/subsection3.xml

@@ -1451,7 +1451,7 @@ function matrix_times_vector(m, v) {
 function transpose(mat) {
     return accumulate_n(<METAPHRASE>??</METAPHRASE>, <METAPHRASE>??</METAPHRASE>, mat);
 }
-function matrix_times_matrix(n, m) {
+function matrix_times_matrix(m, n) {
     const cols = transpose(n);
     return map(<METAPHRASE>??</METAPHRASE>, m);
 }

xml/chapter2/section3/subsection3.xml

@@ -1482,6 +1482,7 @@ tree_to_list_2(union_set_as_tree(
 	</JAVASCRIPT>
       </SNIPPET>
       <SNIPPET>
+	<NAME>intersection_set_as_tree_solution</NAME>
 	<REQUIRES>intersection_set_ordered</REQUIRES>
 	<REQUIRES>list_to_tree</REQUIRES>
 	<REQUIRES>tree_to_list_2</REQUIRES>
@@ -1639,6 +1640,7 @@ lookup(3, list(make_record(2, "Venus"),
     <LABEL NAME="ex:set-lookup-binary-tree"/>
     <SOLUTION>
       <SNIPPET>
+	<NAME>ex_set_lookup_binary_tree</NAME>
 	<REQUIRES>make_tree_function</REQUIRES>
 	<REQUIRES>record</REQUIRES>
 	<EXAMPLE>lookup_example2</EXAMPLE>

xml/chapter2/section4/subsection2.xml

@@ -230,7 +230,7 @@ function magnitude_rectangular(z) {
                      square(imag_part_rectangular(z)));
 }
 function angle_rectangular(z) {
-    return math_atan(imag_part_rectangular(z),
+    return math_atan2(imag_part_rectangular(z),
                      real_part_rectangular(z));
 }
 function make_from_real_imag_rectangular(x, y) {
@@ -297,7 +297,7 @@ function angle_polar(z) { return tail(z); }
 function make_from_real_imag_polar(x, y) {
     return attach_tag("polar",
                       pair(math_sqrt(square(x) + square(y)),
-                           math_atan(y, x)));
+                           math_atan2(y, x)));
 }
 <ALLOW_BREAK/>
 function make_from_mag_ang_polar(r, a) {

xml/chapter2/section4/subsection3.xml

@@ -362,7 +362,7 @@ function install_rectangular_package() {
         return math_sqrt(square(real_part(z)) + square(imag_part(z)));
     }
     function angle(z) {
-        return math_atan(imag_part(z), real_part(z));
+        return math_atan2(imag_part(z), real_part(z));
     }
     function make_from_mag_ang(r, a) {
         return pair(r * math_cos(a), r * math_sin(a));
@@ -508,7 +508,7 @@ function install_polar_package() {
     }
     function make_from_real_imag(x, y) {
         return pair(math_sqrt(square(x) + square(y)),
-                    math_atan(y, x));
+                    math_atan2(y, x));
     }
 
     // interface to the rest of the system
@@ -1551,7 +1551,7 @@ function make_from_real_imag(x, y) {
                : op === "magnitude"
                ? math_sqrt(square(x) + square(y))
                : op === "angle"
-               ? math_atan(y, x)
+               ? math_atan2(y, x)
                : error(op, "unknown op -- make_from_real_imag");
     }
     return dispatch;
@@ -1567,7 +1567,7 @@ function make_from_real_imag(x, y) {
                : op === "magnitude"
                ? math_sqrt(square(x) + square(y))
                : op === "angle"
-               ? math_atan(y, x)
+               ? math_atan2(y, x)
                : error(op, "unknown op -- make_from_real_imag");
     }
     return dispatch;
@@ -1696,7 +1696,7 @@ function install_rectangular_package() {
                    square(imag_part(z)));
     }
     function angle(z) {
-        return math_atan(imag_part(z), real_part(z));
+        return math_atan2(imag_part(z), real_part(z));
     }
     function make_from_mag_ang(r, a) {
         return pair(r * math_cos(a), r * math_sin(a));
@@ -1730,7 +1730,7 @@ function install_polar_package() {
     }
     function make_from_real_imag(x, y) {
        return pair(math_sqrt(square(x) + square(y)),
-                   math_atan(y, x));
+                   math_atan2(y, x));
     }
 
     // interface to the rest of the system

xml/chapter2/section5/subsection1.xml

@@ -994,6 +994,54 @@ function install_complex_package() {
     arithmetic package.  This operation should work for ordinary numbers,
     rational numbers, and complex numbers.
     <LABEL NAME="ex:=zero?"/>
+    <SOLUTION>
+      <SNIPPET EVAL="no">
+	<JAVASCRIPT>
+// provided by GitHub user clean99
+
+function is_equal_to_zero(x) {
+    return apply_generic("is_equal", list(x));
+}
+
+function install_javascript_number_package() {
+    // ...
+
+    put("is_equal_to_zero", "javascript_number",
+          x => x === 0);
+
+    // ...
+}
+
+function install_rational_package() {
+    // ...
+
+    function is_equal_to_zero(x) {
+        return numer(x) === 0;
+    }
+
+    put("is_equal_to_zero", "rational",
+           is_equal_to_zero);
+
+    // ...
+}
+
+function install_complex_package() {
+    // ...
+
+    function is_equal_to_zero(z) {
+        return real_part(z) === 0
+               ? imag_part(z) === 0
+               : false;
+    }
+
+    put("is_equal_to_zero", "complex",
+            is_equal_to_zero);
+
+    //...
+}
+	</JAVASCRIPT>
+      </SNIPPET>
+    </SOLUTION>
   </EXERCISE>
 
   <INDEX>generic arithmetic operations<CLOSE/></INDEX>

xml/chapter2/section5/subsection2.xml

@@ -481,7 +481,7 @@ function install_rectangular_package() {
                    square(imag_part(z)));
     }
     function angle(z) {
-        return math_atan(imag_part(z), real_part(z));
+        return math_atan2(imag_part(z), real_part(z));
     }
     function make_from_mag_ang(r, a) {
         return pair(r * math_cos(a), r * math_sin(a));
@@ -515,7 +515,7 @@ function install_polar_package() {
     }
     function make_from_real_imag(x, y) {
         return pair(math_sqrt(square(x) + square(y)),
-                    math_atan(y, x));
+                    math_atan2(y, x));
     }
 
     // interface to the rest of the system