LaTeX fixing §1--3

Author: TobiasWrigstad

javascript/parseXmlLatex.js

@@ -253,9 +253,16 @@ const processTextFunctionsDefaultLatex = {
   SCHEMEINLINE: (node, writeTo) =>
     processTextFunctionsLatex["JAVASCRIPTINLINE"](node, writeTo),
   JAVASCRIPTINLINE: (node, writeTo) => {
-    writeTo.push("{\\lstinline[mathescape=true]$");
+    if (node.getAttribute("break")) {
+      writeTo.push(
+        "{\\lstinline[breaklines=true, breakatwhitespace=true,mathescape=true]$"
+      );
+    } else {
+      writeTo.push("{\\lstinline[mathescape=true]$");
+    }
     recursiveProcessPureText(node.firstChild, writeTo, {
-      removeNewline: "all"
+      removeNewline: "all",
+      escapeCurlyBracket: true
     });
     writeTo.push("$}");
   },
@@ -317,7 +324,8 @@ const processTextFunctionsEpub = {
   JAVASCRIPTINLINE: (node, writeTo) => {
     writeTo.push("{\\lstinline[mathescape=true, language=JavaScript]$");
     recursiveProcessPureText(node.firstChild, writeTo, {
-      removeNewline: "all"
+      removeNewline: "all",
+      escapeCurlyBracket: true
     });
     writeTo.push("$}");
   },

javascript/processingFunctions/processSnippetPdf.js

@@ -186,7 +186,7 @@ export const processSnippetPdf = (node, writeTo) => {
 
   if (jsOutputSnippet) {
     writeTo.push("\n\\begin{JavaScriptOutput}");
-    writeTo.push(jsOutputSnippet.firstChild.nodeValue);
+    writeTo.push(jsOutputSnippet.firstChild.nodeValue.trimRight());
     writeTo.push("\\end{JavaScriptOutput}");
   }
 

javascript/processingFunctions/recursiveProcessPureText.js

@@ -17,6 +17,10 @@ const recursiveProcessPureText = (
     if (options.removeNewline == "all") {
       value = value.replace(/[\r\n]+/g, " ");
     }
+    if (options.escapeCurlyBracket) {
+      value = value.replace(/\{/g, "\\{");
+      value = value.replace(/\}/g, "\\}");
+    }
     writeTo.push(value);
   }
   return recursiveProcessPureText(node.nextSibling, writeTo, options);

scripts/Makefile

@@ -152,4 +152,6 @@ js_svgs: $(js_path)/ch2-Z-G-65.svg.pdf \
       $(js_path)/Fig5.15c.std.svg.pdf \
 			$(js_path)/ch2-Z-G-ex-2-24.svg.pdf \
 			$(js_path)/ch2-Z-G-ex-2-24-tree.svg.pdf \
+      $(js_path)/ch3-Z-G-35.svg.pdf \
+      $(js_path)/ch3-Z-G-49.svg.pdf \
 			$(js_path)/Fig2.14b.std.svg.pdf