minor formatting

Author: martin-henz

xml/chapter3/section2/subsection1.xml

@@ -166,9 +166,9 @@ function square(x) {
       <SCHEME>just syntactic sugar for</SCHEME>
       <JAVASCRIPT>
 	equivalent to<FOOTNOTE>
-	Footnote<SPACE/><REF NAME="foot:function-decl-vs-lambda"/> mentions
-	subtle differences between the two in full JavaScript, which we will
-	ignore in this edition.</FOOTNOTE>
+	Footnote<SPACE/><REF NAME="foot:function-decl-vs-lambda"/> in chapter 1
+	mentions subtle differences between the two in full JavaScript, which
+	we will ignore in this edition.</FOOTNOTE>
       </JAVASCRIPT>
     </SPLITINLINE>
     an underlying implicit

xml/chapter3/section3/subsection4.xml

@@ -1340,12 +1340,15 @@ function propagate() {
     which places a <QUOTE>probe</QUOTE> on a wire, shows the simulator in
     action.  The probe tells the wire that, whenever its signal changes value,
     it should print the new signal value, together with the current time and
-    a name that identifies the wire:<SPLITINLINE><JAVASCRIPT>We use
+    a name that identifies the
+    <SPLITINLINE>
+      <SCHEME>wire:</SCHEME>
+      <JAVASCRIPT>wire. We use
     the primitive function <JAVASCRIPTINLINE>stringify</JAVASCRIPTINLINE>
-    to turn a number into a string. Note that the
-    <JAVASCRIPTINLINE>+</JAVASCRIPTINLINE> operator is applied to
-    two strings here, which results in the concatenation of the operand
-    strings.</JAVASCRIPT></SPLITINLINE>
+    to turn a number into a string. Tnhe
+    <JAVASCRIPTINLINE>+</JAVASCRIPTINLINE> operator is <EM>overloaded</EM>
+    in JavaScript; it can be applied to two strings, in which case the
+    result is their concatenation.</JAVASCRIPT></SPLITINLINE>
     <!--  \indcode*{probe}[in digital-circuit simulator] -->
     <SNIPPET>
       <NAME>probe</NAME>

xml/chapter3/section5/subsection4.xml

@@ -322,8 +322,8 @@ function solve(f, y0, dt) {
     equation <LATEXINLINE>$dy/dt=y$</LATEXINLINE> with initial condition
     <LATEXINLINE>$y(0)=1$</LATEXINLINE>:<FOOTNOTE><SPLITINLINE>
     <JAVASCRIPT>This calculations necessitates the use of the memoization
-    optimization from section<SPACE/> in the functions
-    <JAVASCRIPTINLINE>stream_combine</JAVASCRIPTINLINE> and
+    optimization from section<SPACE/><REF NAME="sec:delayed-lists"/> in
+    the functions <JAVASCRIPTINLINE>stream_combine</JAVASCRIPTINLINE> and
     <JAVASCRIPTINLINE>integral</JAVASCRIPTINLINE>.</JAVASCRIPT>
     </SPLITINLINE></FOOTNOTE>
     <SNIPPET HIDE="yes">

xml/chapter4/section4/subsection1.xml

@@ -162,7 +162,8 @@ job(list("Fect", "Cy", "D"), list("computer", "programmer"))
 salary(list("Fect", "Cy", "D"), 35000)
 supervisor(list("Fect", "Cy", "D"), list("Bitdiddle", "Ben"))
 
-address(list("Tweakit", "Lem", "E"), list("Boston", "Bay State Road", 22))
+address(list("Tweakit", "Lem", "E"), 
+        list("Boston", "Bay State Road", 22))
 job(list("Tweakit", "Lem", "E"), list("computer", "technician"))
 salary(list("Tweakit", "Lem", "E"), 25000)
 supervisor(list("Tweakit", "Lem", "E"), list("Bitdiddle", "Ben"))
@@ -1060,10 +1061,12 @@ query_driver_loop();
       </SCHEME>
       <JAVASCRIPT>
 and(job(list("Hacker", "Alyssa", "P"), list("computer", "programmer")),
-    address(list("Hacker", "Alyssa", "P"), list("Cambridge", "Mass Ave", 78)))
+    address(list("Hacker", "Alyssa", "P"), 
+            list("Cambridge", "Mass Ave", 78)))
 
 and(job(list("Fect", "Cy", "D"), list("computer", "programmer")),
-    address(list("Fect", "Cy", "D"), list("Cambridge", "Ames Street", 3)))
+    address(list("Fect", "Cy", "D"), 
+            list("Cambridge", "Ames Street", 3)))
       </JAVASCRIPT>
     </SNIPPET>
   </TEXT>
@@ -2084,7 +2087,7 @@ query_driver_loop();
       </JAVASCRIPT_RUN>
       <JAVASCRIPT_OUTPUT>
 Query results:
-append_to_form(list("a", "b"), list("c", "d"), list("a", "b", "c", "d"))
+append_to_form(list("a","b"),list("c","d"),list("a","b","c","d"))
       </JAVASCRIPT_OUTPUT>
     </SNIPPET>
   </TEXT>
@@ -2143,7 +2146,7 @@ query_driver_loop();
       </JAVASCRIPT_RUN>
       <JAVASCRIPT_OUTPUT>
 Query results:
-append_to_form(list("a", "b"), list("c", "d"), list("a", "b", "c", "d"))
+append_to_form(list("a","b"),list("c","d"),list("a","b","c","d"))
       </JAVASCRIPT_OUTPUT>
     </SNIPPET>
   </TEXT>
@@ -2201,11 +2204,11 @@ query_driver_loop();
       </JAVASCRIPT_RUN>
       <JAVASCRIPT_OUTPUT>
 Query results:
-append_to_form(null, list("a", "b", "c", "d"), list("a", "b", "c", "d"))
-append_to_form(list("a"), list("b", "c", "d"), list("a", "b", "c", "d"))
-append_to_form(list("a", "b"), list("c", "d"), list("a", "b", "c", "d"))
-append_to_form(list("a", "b", "c"), list("d"), list("a", "b", "c", "d"))
-append_to_form(list("a", "b", "c", "d"), null, list("a", "b", "c", "d"))
+append_to_form(null,list("a","b","c","d"),list("a","b","c","d"))
+append_to_form(list("a"),list("b","c","d"),list("a","b","c","d"))
+append_to_form(list("a","b"),list("c","d"),list("a","b","c","d"))
+append_to_form(list("a","b","c"),list("d"),list("a","b","c","d"))
+append_to_form(list("a","b","c","d"),null,list("a","b","c","d"))
       </JAVASCRIPT_OUTPUT>
     </SNIPPET>
   </TEXT>

xml/chapter4/section4/subsection3.xml

@@ -688,15 +688,23 @@ accumulation_function($\textit{variable}$,
 	  </LI>
 	  <LI>
 	    Represent the fact about Irad, for example, as
-	    <JAVASCRIPTINLINE>related(list("great", "grandson"), "Adam", "Irad")</JAVASCRIPTINLINE>.
+	    <SNIPPET EVAL="no">
+	      <JAVASCRIPT>
+related(list("great", "grandson"), "Adam", "Irad")
+	      </JAVASCRIPT>
+	    </SNIPPET>
 	  </LI>
 	  <LI>
 	    Write rules that determine if a list ends in the word
 	    <JAVASCRIPTINLINE>"grandson"</JAVASCRIPTINLINE>.
 	  </LI>
 	  <LI>
 	    Use this to express a rule that allows one to derive the relationship
-	    <JAVASCRIPTINLINE>list(pair("great", rel), x, y)</JAVASCRIPTINLINE>,
+	    <SNIPPET EVAL="no">
+	      <JAVASCRIPT>
+list(pair("great", rel), x, y)
+	      </JAVASCRIPT>
+	    </SNIPPET>
 	    where <JAVASCRIPTINLINE>rel</JAVASCRIPTINLINE> is a list ending in
 	    <JAVASCRIPTINLINE>"grandson"</JAVASCRIPTINLINE>.
 	  </LI>

xml/chapter4/section4/subsection4.xml

@@ -489,8 +489,9 @@ function evaluate_query(query, frame_stream) {
 function simple_query(query_pattern, frame_stream) {
     return stream_flatmap(
         frame => 
-            stream_append_delayed(find_assertions(query_pattern, frame),
-                                  () => apply_rules(query_pattern, frame)),
+            stream_append_delayed(
+                find_assertions(query_pattern, frame),
+                () => apply_rules(query_pattern, frame)),
         frame_stream);
 }
 	</JAVASCRIPT>
@@ -3207,7 +3208,8 @@ function make_new_variable(variable, rule_application_id) {
 	    <JAVASCRIPT>
 function contract_question_mark(variable) {
     return is_number(head(tail(variable)))
-        ? head(tail(tail(variable))) + "_" + stringify(head(tail(variable)))
+        ? head(tail(tail(variable))) + 
+          "_" + stringify(head(tail(variable)))
         : head(tail(variable));
 }
 function comma_separated(strings) {
@@ -3387,7 +3389,8 @@ function simple_query(query_pattern, frame_stream) {
 function disjoin(disjuncts, frame_stream) {
     return is_empty_disjunction(disjuncts)
         ? null
-        : interleave(evaluate_query(first_disjunct(disjuncts), frame_stream),
+        : interleave(evaluate_query(first_disjunct(disjuncts), 
+                                    frame_stream),
                      disjoin(rest_disjuncts(disjuncts), frame_stream));
 }
 	</JAVASCRIPT>