diff --git a/scripts/fix-gray.sh b/scripts/fix-gray.sh
new file mode 100755
index 000000000..93f465d1c
--- /dev/null
+++ b/scripts/fix-gray.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+rm -f /tmp/file.pdf
+mv $1 /tmp/file.pdf
+gs \
+ -sOutputFile=$1 \
+ -sDEVICE=pdfwrite \
+ -sColorConversionStrategy=Gray \
+ -dProcessColorModel=/DeviceGray \
+ -dCompatibilityLevel=1.4 \
+ -dNOPAUSE \
+ -dBATCH \
+ /tmp/file.pdf
diff --git a/static/img_javascript/Fig2.14b.std.svg b/static/img_javascript/Fig2.14b.std.svg
index e58a24e01..b8d4530c7 100644
--- a/static/img_javascript/Fig2.14b.std.svg
+++ b/static/img_javascript/Fig2.14b.std.svg
@@ -8,7 +8,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
sodipodi:docname="Fig2.14b.std.svg"
version="1.1"
style="display:inline"
@@ -19,15 +19,15 @@
inkscape:document-rotation="0"
inkscape:current-layer="svg68045"
inkscape:window-maximized="0"
- inkscape:window-y="23"
+ inkscape:window-y="32"
inkscape:window-x="0"
inkscape:cy="530.82098"
- inkscape:cx="282.05932"
+ inkscape:cx="112.884"
inkscape:zoom="1.3092926"
showgrid="false"
id="namedview24"
- inkscape:window-height="804"
- inkscape:window-width="1440"
+ inkscape:window-height="2095"
+ inkscape:window-width="1914"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
guidetolerance="10"
@@ -91,28 +91,28 @@
id="layer7"
transform="translate(-28.231255,-40.362183)">
right_split(wave, 4)
+ y="342.87305"
+ id="tspan19"
+ style="font-size:20px">right_split(wave, 4)
right_split(rogers, 4)
@@ -182,8 +187,8 @@
y="713.51953"
id="text94932"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">corner_split(wave, 4)
@@ -192,8 +197,8 @@
y="713.51953"
id="text94940"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">corner_split(rogers, 4)
diff --git a/static/img_javascript/Fig2.14b.std.svg.pdf b/static/img_javascript/Fig2.14b.std.svg.pdf
index 253ddb178..89a680dc7 100644
Binary files a/static/img_javascript/Fig2.14b.std.svg.pdf and b/static/img_javascript/Fig2.14b.std.svg.pdf differ
diff --git a/static/img_javascript/Fig3.30b.svg.pdf b/static/img_javascript/Fig3.30b.svg.pdf
index 01bd22ad2..64032ebcf 100644
Binary files a/static/img_javascript/Fig3.30b.svg.pdf and b/static/img_javascript/Fig3.30b.svg.pdf differ
diff --git a/static/img_javascript/Fig4.4a.std.pdf b/static/img_javascript/Fig4.4a.std.pdf
index 2ef1c0f86..9b2cb1fc5 100644
Binary files a/static/img_javascript/Fig4.4a.std.pdf and b/static/img_javascript/Fig4.4a.std.pdf differ
diff --git a/static/img_javascript/Fig4.4a.std.svg b/static/img_javascript/Fig4.4a.std.svg
index 70b9cce22..7ef997e76 100644
--- a/static/img_javascript/Fig4.4a.std.svg
+++ b/static/img_javascript/Fig4.4a.std.svg
@@ -24,15 +24,15 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="1914"
- inkscape:window-height="2095"
+ inkscape:window-width="3840"
+ inkscape:window-height="2160"
id="namedview30"
showgrid="false"
- inkscape:zoom="1.078341"
- inkscape:cx="138.9473"
- inkscape:cy="127.15411"
+ inkscape:zoom="3.0500089"
+ inkscape:cx="429.27432"
+ inkscape:cy="133.05573"
inkscape:window-x="0"
- inkscape:window-y="32"
+ inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg4154"
inkscape:document-rotation="0"
@@ -52,7 +52,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
image/svg+xml
-
+
@@ -139,19 +139,19 @@
x="222.44522"
y="77.686752"
id="rect6788-7-9"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:1.01467;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
input streaminput streamof frames
+ y="119.74185"
+ id="tspan858">of frames
output stream of frames,output stream of frames,filtered and extended
+ y="119.74129"
+ id="tspan860">filtered and extended
query
+ style="-inkscape-font-specification:'Latin Modern Mono';font-family:'Latin Modern Mono';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:22px">query
job($x, $y)
+ style="-inkscape-font-specification:'Latin Modern Mono';font-family:'Latin Modern Mono';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:22px">job($x, $y)
stream of assertionsstream of assertionsfrom data base
+ id="tspan864">from data base
diff --git a/static/img_javascript/Fig4.4a.std.svg.pdf b/static/img_javascript/Fig4.4a.std.svg.pdf
index 75f36faa4..0dac5f546 100644
Binary files a/static/img_javascript/Fig4.4a.std.svg.pdf and b/static/img_javascript/Fig4.4a.std.svg.pdf differ
diff --git a/static/img_javascript/Fig4.5a.std.pdf b/static/img_javascript/Fig4.5a.std.pdf
index 0caedc200..72e8914d6 100644
Binary files a/static/img_javascript/Fig4.5a.std.pdf and b/static/img_javascript/Fig4.5a.std.pdf differ
diff --git a/static/img_javascript/Fig4.5a.std.svg b/static/img_javascript/Fig4.5a.std.svg
index 5252a6edb..f2b15c7d9 100644
--- a/static/img_javascript/Fig4.5a.std.svg
+++ b/static/img_javascript/Fig4.5a.std.svg
@@ -29,9 +29,9 @@
inkscape:window-height="2160"
id="namedview46"
showgrid="false"
- inkscape:zoom="1.0883721"
- inkscape:cx="133.2265"
- inkscape:cy="129"
+ inkscape:zoom="4.3534884"
+ inkscape:cx="336.76854"
+ inkscape:cy="117.05556"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
@@ -48,7 +48,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
image/svg+xml
-
+
@@ -166,13 +166,13 @@
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467431;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
@@ -189,7 +189,7 @@
x="268.0816"
y="109.61853"
id="rect6788-7-2-7"
- style="fill:#ffffff;fill-opacity:1;stroke:#383838;stroke-width:1.01467431;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467431;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467431;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.4881891;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.4881891;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.4881891;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.4881891;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.4881891;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.0629921;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.4881891;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend);display:inline" />
and(A, B)
+ style="-inkscape-font-specification:'Latin Modern Mono';font-family:'Latin Modern Mono';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:22px">and(A, B)
data base
+ id="tspan5631"
+ style="font-size:24.4px">data base
input streaminput streamof frames
+ y="119.86096"
+ id="tspan888"
+ style="line-height:29.33333397px">of frames
output streamoutput streamof frames
+ id="tspan892">of frames
A
+ style="-inkscape-font-specification:'Latin Modern Mono';font-family:'Latin Modern Mono';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:22px">A
B
+ style="-inkscape-font-specification:'Latin Modern Mono';font-family:'Latin Modern Mono';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:22px">B
diff --git a/static/img_javascript/Fig4.5a.std.svg.pdf b/static/img_javascript/Fig4.5a.std.svg.pdf
index 2ddb6323d..94d49774d 100644
Binary files a/static/img_javascript/Fig4.5a.std.svg.pdf and b/static/img_javascript/Fig4.5a.std.svg.pdf differ
diff --git a/static/img_javascript/Fig4.6a.std.pdf b/static/img_javascript/Fig4.6a.std.pdf
index dcfec0463..ec8a6d3a1 100644
Binary files a/static/img_javascript/Fig4.6a.std.pdf and b/static/img_javascript/Fig4.6a.std.pdf differ
diff --git a/static/img_javascript/Fig4.6a.std.svg b/static/img_javascript/Fig4.6a.std.svg
index 39ebcdd51..ed23eb878 100644
--- a/static/img_javascript/Fig4.6a.std.svg
+++ b/static/img_javascript/Fig4.6a.std.svg
@@ -12,7 +12,7 @@
id="svg5767"
version="1.1"
sodipodi:docname="Fig4.6a.std.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
@@ -46,7 +46,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467419;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.0629921;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.0629921;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818886;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818886;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818886;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818886;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818886;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818886;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818886;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818886;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818886;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
merge
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';font-size:11.52381018px">merge
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
A
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';font-size:11.52381018px">A
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
B
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';font-size:11.52381018px">B
or(A, B)
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';font-size:22px">or(A, B)
data base
+ id="tspan5631-3"
+ style="font-size:24.4px">data base
output stream
-output streamof frames
+ y="167.4686"
+ id="tspan961">of frames
input streaminput streamof frames
+ y="146.88341"
+ id="tspan956">of frames
diff --git a/static/img_javascript/Fig4.6a.std.svg.pdf b/static/img_javascript/Fig4.6a.std.svg.pdf
index a24a9de9d..41e8c4911 100644
Binary files a/static/img_javascript/Fig4.6a.std.svg.pdf and b/static/img_javascript/Fig4.6a.std.svg.pdf differ
diff --git a/static/img_javascript/Fig5.11b.std.svg b/static/img_javascript/Fig5.11b.std.svg
index 71b8d62f0..3ed322839 100644
--- a/static/img_javascript/Fig5.11b.std.svg
+++ b/static/img_javascript/Fig5.11b.std.svg
@@ -52,7 +52,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -92,7 +92,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path127"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -342,7 +342,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path206"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -599,7 +599,7 @@
style="display:inline"
id="layer2"
transform="translate(-7.7046566,-39.197702)">
@@ -609,12 +609,12 @@
path
- style="display:inline;fill:none;stroke:#383838;stroke-width:1.01467347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.01467347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect6788-7-2-7-4-3-4-8-3-7"
d="m 445.9685,445.61892 h 45.81814 c 5.72727,0 8.74019,-3.77068 5.72727,-9.54545 l -22.90907,-43.90905 c -2.99386,-5.72727 -8.41979,-5.667 -11.45454,0 l -22.90907,43.90905 c -3.01292,5.77477 0,9.54545 5.72727,9.54545 z"
inkscape:connector-curvature="0" />
after_fact
@@ -983,7 +983,7 @@
y="368.23944"
id="text5286"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">fact_done
@@ -992,21 +992,21 @@
y="393.05759"
id="text4051"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">1
=
@@ -1022,13 +1022,13 @@
x="30"
y="82.362183"
id="rect6788-7-2-7-4-3"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
val
@@ -1045,13 +1045,13 @@
x="180"
y="82.362183"
id="rect6788-7-2-7-4-3-3"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
n
@@ -1068,13 +1068,13 @@
x="290"
y="82.362183"
id="rect6788-7-2-7-4-3-0"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
stack
@@ -1084,7 +1084,7 @@
y="270.0137"
id="text6689-7-1-4"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">continue
@@ -1093,7 +1093,7 @@
y="270.91382"
id="text6689-7-1-3-1-1"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">*
@@ -1102,7 +1102,7 @@
y="270.23572"
id="text6689-7-1-3-1-1-3"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">sn
@@ -1121,7 +1121,7 @@
y="174.69824"
id="text4978"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">rn
@@ -1130,7 +1130,7 @@
y="202.14865"
id="text5268"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;display:inline;fill:#383838;fill-opacity:1;stroke:none">sc
@@ -1139,7 +1139,7 @@
y="202.14865"
id="text5272"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#383838;fill-opacity:1;stroke:none">rc
@@ -1148,7 +1148,7 @@
y="268.9668"
id="text5316"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;display:inline;fill:#383838;fill-opacity:1;stroke:none">controller
@@ -1238,7 +1238,7 @@
x="178.65306"
y="118.92238" />
diff --git a/static/img_javascript/Fig5.11b.std.svg.pdf b/static/img_javascript/Fig5.11b.std.svg.pdf
index 3f38aa860..a0986a030 100644
Binary files a/static/img_javascript/Fig5.11b.std.svg.pdf and b/static/img_javascript/Fig5.11b.std.svg.pdf differ
diff --git a/static/img_javascript/Fig5.14b.std.pdf b/static/img_javascript/Fig5.14b.std.pdf
index a543d3c50..3661ed50e 100644
Binary files a/static/img_javascript/Fig5.14b.std.pdf and b/static/img_javascript/Fig5.14b.std.pdf differ
diff --git a/static/img_javascript/Fig5.14b.std.svg b/static/img_javascript/Fig5.14b.std.svg
index 01be21a9e..7b9b0037f 100644
--- a/static/img_javascript/Fig5.14b.std.svg
+++ b/static/img_javascript/Fig5.14b.std.svg
@@ -30,9 +30,9 @@
inkscape:window-height="2160"
id="namedview4789"
showgrid="false"
- inkscape:zoom="1.3734749"
- inkscape:cx="-117.23261"
- inkscape:cy="295.15459"
+ inkscape:zoom="2.7469498"
+ inkscape:cx="360.7521"
+ inkscape:cy="112.99266"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
@@ -53,7 +53,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.4,0,0,0.4,4,0)"
id="path4565-5"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -507,7 +507,7 @@
y="90.219322"
id="text2985"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.47700024px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none"> +---+---+ +---+ +---+---+ +---+---+ +---+---+ +---+
+ style="display:inline;fill:none;stroke:#000000;stroke-width:0.88582677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -630,83 +630,83 @@
x="220"
y="162.36218"
id="rect3794-7"
- style="fill:none;stroke:#383838;stroke-width:0.88582677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:0.88582677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
0
1
2
3
4
5
6
7
8
...
Index
+ style="-inkscape-font-specification:'Times LT Std';font-family:'Times LT Std';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:22px">Index
the_heads
the_tails
p5
n3
n4
n1
n2
...
p2
p4
e0
p7
e0
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818827;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
Just before garbage collection
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">Just before garbage collection
mixture of useful data and garbage
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">mixture of useful data and garbage
free memory
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">free memory
Just after garbage collection
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">Just after garbage collection
discarded memory
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">discarded memory
useful data
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">useful data
free area
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">free area
workingworking memory
+ y="135.46176"
+ id="tspan896">memory
freefree memory
+ y="259.55264"
+ id="tspan898">memory
newnew freefree memory
+ y="394.76196"
+ id="tspan902">memory
newnew workingworking memory
+ y="518.85284"
+ id="tspan906">memory
the_heads
@@ -334,7 +344,7 @@
y="139.17262"
id="text9428"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">the_tails
@@ -343,7 +353,7 @@
y="480.8804"
id="text9424-2"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">the_heads
@@ -352,7 +362,7 @@
y="511.92728"
id="text9428-3"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">the_tails
@@ -361,7 +371,7 @@
y="356.78955"
id="text9424-6"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">new_heads
@@ -370,7 +380,7 @@
y="387.83643"
id="text9428-36"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">new_tails
@@ -379,7 +389,7 @@
y="232.69867"
id="text9424-6-3"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">new_heads
@@ -388,14 +398,14 @@
y="263.74557"
id="text9428-36-8"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">new_tails
diff --git a/static/img_javascript/Fig5.15c.std.svg.pdf b/static/img_javascript/Fig5.15c.std.svg.pdf
index d172766ca..27e45826a 100644
Binary files a/static/img_javascript/Fig5.15c.std.svg.pdf and b/static/img_javascript/Fig5.15c.std.svg.pdf differ
diff --git a/static/img_javascript/Fig5.4c.std.pdf b/static/img_javascript/Fig5.4c.std.pdf
index 55ecbf79a..77572257f 100644
Binary files a/static/img_javascript/Fig5.4c.std.pdf and b/static/img_javascript/Fig5.4c.std.pdf differ
diff --git a/static/img_javascript/Fig5.4c.std.svg b/static/img_javascript/Fig5.4c.std.svg
index 72e9839f6..f9c0e3002 100644
--- a/static/img_javascript/Fig5.4c.std.svg
+++ b/static/img_javascript/Fig5.4c.std.svg
@@ -53,7 +53,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -280,55 +280,55 @@
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467526;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467526;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467526;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
prompt
@@ -535,7 +535,7 @@
y="262.48129"
id="text6689-7-1"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">a
@@ -544,7 +544,7 @@
y="262.48129"
id="text6689-7-1-5"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">b
@@ -553,7 +553,7 @@
y="568.61792"
id="text6689-7-1-3"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">t
@@ -562,7 +562,7 @@
y="414.52686"
id="text6689-7-1-3-1-1"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">rem
@@ -571,7 +571,7 @@
y="288.16165"
id="text4630"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">0
@@ -610,7 +610,7 @@
y="262.52524"
id="text4171"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">=
@@ -619,7 +619,7 @@
y="414.52686"
id="text6689-7-1-3-1-3"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">display
@@ -628,7 +628,7 @@
y="194.61612"
id="text4630-9"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#383838;fill-opacity:1;stroke:none">P
diff --git a/static/img_javascript/Fig5.4c.std.svg.pdf b/static/img_javascript/Fig5.4c.std.svg.pdf
index ed542983b..253d74369 100644
Binary files a/static/img_javascript/Fig5.4c.std.svg.pdf and b/static/img_javascript/Fig5.4c.std.svg.pdf differ
diff --git a/static/img_javascript/Fig5.7b.std.svg b/static/img_javascript/Fig5.7b.std.svg
index b69fc07df..b4d7ff648 100644
--- a/static/img_javascript/Fig5.7b.std.svg
+++ b/static/img_javascript/Fig5.7b.std.svg
@@ -53,7 +53,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -280,100 +280,100 @@
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
a
@@ -415,13 +415,13 @@
x="165"
y="52.362183"
id="rect6788-7-2-7-4-3-6"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
b
@@ -438,13 +438,13 @@
x="107.55355"
y="212.36218"
id="rect6788-7-2-7-4-3-4"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
t
@@ -454,7 +454,7 @@
y="269.28107"
id="text6689-7-1-3-1"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">rem
@@ -463,7 +463,7 @@
y="162.00694"
id="text4630"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">
0
@@ -515,14 +515,14 @@
d="m 310,72.362183 a 15,15 0 1 1 -30,0 15,15 0 1 1 30,0 z"
transform="translate(-35,-5)"
id="path4082"
- style="display:inline;fill:none;stroke:#383838;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
inkscape:connector-curvature="0" />
=
@@ -534,100 +534,100 @@
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
c
@@ -664,13 +664,13 @@
x="425"
y="52.362183"
id="rect6788-7-2-7-4-3-6-3"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
d
@@ -687,13 +687,13 @@
x="322.55356"
y="212.36218"
id="rect6788-7-2-7-4-3-4-7"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
s
@@ -703,7 +703,7 @@
y="660.64453"
id="text6689-7-1-3-1-4"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">rem
@@ -712,7 +712,7 @@
y="553.37048"
id="text4630-8"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">
0
@@ -764,14 +764,14 @@
d="m 310,72.362183 a 15,15 0 1 1 -30,0 15,15 0 1 1 30,0 z"
transform="translate(225,-5)"
id="path4082-4"
- style="display:inline;fill:none;stroke:#383838;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ style="display:inline;fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
inkscape:connector-curvature="0" />
=
diff --git a/static/img_javascript/Fig5.7b.std.svg.pdf b/static/img_javascript/Fig5.7b.std.svg.pdf
index 73ec31372..aeb3fca59 100644
Binary files a/static/img_javascript/Fig5.7b.std.svg.pdf and b/static/img_javascript/Fig5.7b.std.svg.pdf differ
diff --git a/static/img_javascript/cc_1.jpg b/static/img_javascript/cc_1.jpg
deleted file mode 100644
index 90be9d3ef..000000000
Binary files a/static/img_javascript/cc_1.jpg and /dev/null differ
diff --git a/static/img_javascript/cc_1.png b/static/img_javascript/cc_1.png
deleted file mode 100644
index 9c53d383c..000000000
Binary files a/static/img_javascript/cc_1.png and /dev/null differ
diff --git a/static/img_javascript/cc_2.jpg b/static/img_javascript/cc_2.jpg
deleted file mode 100644
index 8e2c4f587..000000000
Binary files a/static/img_javascript/cc_2.jpg and /dev/null differ
diff --git a/static/img_javascript/cc_2.png b/static/img_javascript/cc_2.png
deleted file mode 100644
index d6d66f6a1..000000000
Binary files a/static/img_javascript/cc_2.png and /dev/null differ
diff --git a/static/img_javascript/cc_3.jpg b/static/img_javascript/cc_3.jpg
deleted file mode 100644
index 763819d5b..000000000
Binary files a/static/img_javascript/cc_3.jpg and /dev/null differ
diff --git a/static/img_javascript/cc_3.png b/static/img_javascript/cc_3.png
deleted file mode 100644
index a7a5304c4..000000000
Binary files a/static/img_javascript/cc_3.png and /dev/null differ
diff --git a/static/img_javascript/ch1-Z-G-1.svg b/static/img_javascript/ch1-Z-G-1.svg
index bad4bcc5b..3724f8bd5 100644
--- a/static/img_javascript/ch1-Z-G-1.svg
+++ b/static/img_javascript/ch1-Z-G-1.svg
@@ -56,7 +56,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path3842"
- style="fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -122,7 +122,7 @@
y="283.07648"
id="text3021"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -131,7 +131,7 @@
y="258.79074"
id="text3025"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Courier New';-inkscape-font-specification:'Courier New';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -140,7 +140,7 @@
y="258.79074"
id="text3029"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -149,7 +149,7 @@
y="250.93361"
id="text3033"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:FreeMono;-inkscape-font-specification:FreeMono;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -158,7 +158,7 @@
y="254.50504"
id="text3037"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:FreeMono;-inkscape-font-specification:FreeMono;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -167,7 +167,7 @@
y="258.79074"
id="text3041"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -196,7 +196,7 @@
y="258.07648"
id="text3053"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;line-height:125%;font-family:LMMono12;-inkscape-font-specification:LMMono12;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -215,7 +215,7 @@
y="221.6479"
id="text3061"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:LMMono12;-inkscape-font-specification:LMMono12;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -224,52 +224,52 @@
y="396.64789"
id="text3065"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:LMMono12;-inkscape-font-specification:LMMono12;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
@@ -156,7 +156,7 @@
y="76.687393"
id="text8005"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:150%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#383838">
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
@@ -303,7 +303,7 @@
transform="translate(119.375,120.50487)"
id="text5042"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">
@@ -312,7 +312,7 @@
y="-59.808353"
id="text5046"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">
@@ -332,7 +332,7 @@
y="16.073187"
id="text5054"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(3)
fib(3)
@@ -359,7 +359,7 @@
y="94.448578"
id="text5066"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(2)
@@ -368,7 +368,7 @@
y="94.365906"
id="text5070"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(2)
@@ -377,7 +377,7 @@
y="94.448578"
id="text5074"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(1)
@@ -386,7 +386,7 @@
y="173.6662"
id="text5078"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(2)
@@ -395,7 +395,7 @@
y="173.62218"
id="text5082"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(1)
@@ -404,7 +404,7 @@
y="173.62218"
id="text5086"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(1)
@@ -413,7 +413,7 @@
y="173.53947"
id="text5090"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(0)
@@ -422,7 +422,7 @@
y="173.62218"
id="text5094"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(1)
@@ -431,7 +431,7 @@
y="173.6662"
id="text5098"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(0)
@@ -440,7 +440,7 @@
y="227.68558"
id="text5102"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">1
@@ -449,7 +449,7 @@
y="226.80403"
id="text5106"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">1
@@ -458,7 +458,7 @@
y="227.12074"
id="text5110"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">1
@@ -467,7 +467,7 @@
y="227.20348"
id="text5114"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">0
@@ -476,7 +476,7 @@
y="227.28615"
id="text5118"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">0
@@ -485,7 +485,7 @@
y="306.12897"
id="text5122"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">0
@@ -494,7 +494,7 @@
y="306.29437"
id="text5126"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">1
@@ -503,7 +503,7 @@
y="252.75708"
id="text5130"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(1)
@@ -512,7 +512,7 @@
y="252.7131"
id="text5134"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib(0)
@@ -521,7 +521,7 @@
y="148.74535"
id="text5110-3"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">1
@@ -533,111 +533,111 @@
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86456692;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.94250661;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.94250668, 2.82752002;stroke-dashoffset:0;display:inline" />
diff --git a/static/img_javascript/ch1-Z-G-13.svg.pdf b/static/img_javascript/ch1-Z-G-13.svg.pdf
index a016c9b4b..d54a77a89 100644
Binary files a/static/img_javascript/ch1-Z-G-13.svg.pdf and b/static/img_javascript/ch1-Z-G-13.svg.pdf differ
diff --git a/static/img_javascript/ch1-Z-G-6.svg b/static/img_javascript/ch1-Z-G-6.svg
index f11e427c8..fd53b8191 100644
--- a/static/img_javascript/ch1-Z-G-6.svg
+++ b/static/img_javascript/ch1-Z-G-6.svg
@@ -71,7 +71,7 @@
y="277.22516"
id="text3806"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:'Latin Modern Mono, Normal';letter-spacing:0px;word-spacing:0px;display:inline;fill:#383838;fill-opacity:1;stroke:none;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">
@@ -122,7 +122,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.8,0,0,0.8,10,0)"
id="path4631"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -183,7 +183,7 @@
x="182.1723"
y="23.532969"
id="rect3794-7-1"
- style="display:inline;fill:none;fill-opacity:1;stroke:#383838;stroke-width:0.811737;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.811737;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -399,7 +399,7 @@
x="107.17252"
y="63.069424"
id="rect3794-7-1-0"
- style="display:inline;fill:none;fill-opacity:1;stroke:#383838;stroke-width:0.8117395;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.8117395;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.8117395;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.8117395;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.8117395;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.8117395;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.8117395;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
1
4
2
3
3
4
1
@@ -452,7 +452,7 @@
x="107.17242"
y="153.53273"
id="rect3794-7-1-0"
- style="display:inline;fill:none;fill-opacity:1;stroke:#383838;stroke-width:0.811738;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.811738;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.811738;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.811738;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.811738;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -510,10 +510,15 @@
image/svg+xml
-
+
-
+
+
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.81132936;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.81132936;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.81132936;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.81132936;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.81132936;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
[1, [2, null]]
+ id="tspan4687">[1, [2, null]]
[3, [4, null]]
+ id="tspan4729">[3, [4, null]]
[[1, [2, null]], [3, [4, null]]]
+ id="tspan4683">[[1, [2, null]], [3, [4, null]]]
diff --git a/static/img_javascript/ch2-Z-G-15.svg.pdf b/static/img_javascript/ch2-Z-G-15.svg.pdf
index 3a9dc280a..65097ee11 100644
Binary files a/static/img_javascript/ch2-Z-G-15.svg.pdf and b/static/img_javascript/ch2-Z-G-15.svg.pdf differ
diff --git a/static/img_javascript/ch2-Z-G-16.svg b/static/img_javascript/ch2-Z-G-16.svg
index fc44a1d47..b455fdae7 100644
--- a/static/img_javascript/ch2-Z-G-16.svg
+++ b/static/img_javascript/ch2-Z-G-16.svg
@@ -9,7 +9,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="197.90005"
width="409.73999"
- inkscape:version="1.0rc1 (09960d6, 2020-04-09)"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
sodipodi:docname="ch2-Z-G-16.svg"
version="1.1"
style="display:inline"
@@ -25,15 +25,15 @@
fit-margin-top="0"
inkscape:current-layer="svg2"
inkscape:window-maximized="0"
- inkscape:window-y="23"
+ inkscape:window-y="0"
inkscape:window-x="0"
- inkscape:cy="95.212045"
- inkscape:cx="-183.74898"
- inkscape:zoom="0.84709239"
+ inkscape:cy="94.585986"
+ inkscape:cx="261.06617"
+ inkscape:zoom="4.7918782"
showgrid="false"
id="namedview328"
- inkscape:window-height="804"
- inkscape:window-width="1440"
+ inkscape:window-height="2160"
+ inkscape:window-width="3840"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
guidetolerance="10"
@@ -87,7 +87,7 @@
image/svg+xml
-
+
@@ -96,7 +96,7 @@
id="layer2"
transform="translate(-43.900441,-402.45211)">
@@ -239,25 +239,31 @@
id="layer3"
transform="translate(-43.900441,-402.45211)">
[[1, [2, null]], [3, [4, null]]]
+ x="255.28043">[[1, [2, null]], [3, [4, null]]]
[1, [2, null]]
+ x="213.28044">[1, [2, null]]
3
4
1
@@ -210,36 +210,36 @@
x="53.193272"
y="69.714439"
id="rect3794-77-9-4-8"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.81173909;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173909;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173909;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173909;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173909;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173909;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173909;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173909;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173909;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
enumerate:
filter:
map:
accumulate:
enumerate:
map:
filter:
image/svg+xml
-
+
@@ -107,61 +107,65 @@
x="258.49637"
y="34.847168"
id="rect66724-4"
- style="fill:none;stroke:#383838;stroke-width:1.01467514;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467514;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
right_split
+ x="286.87119"
+ style="font-size:22px">right_split
identity
+ x="95.961945"
+ style="font-size:22px">identity
right_split
+ x="286.87119"
+ style="font-size:22px">right_split
right_split(right_split(n)
+ style="font-style:oblique;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono Oblique';font-size:22px">n)
right_split
+ x="200"
+ style="font-size:11.52379932px">right_split
corner_split
+ x="200"
+ style="font-size:11.52379932px">corner_split
up_split
nn--1
up_split
right_split
+ x="200"
+ style="font-size:11.52379932px">right_split
identity
+ x="100"
+ style="font-size:11.52379932px">identity
nn--1
nn--1
nn--1
nn--1
corner_split(corner_split(n)
nn--1
nn--1
diff --git a/static/img_javascript/ch2-Z-G-37.svg.pdf b/static/img_javascript/ch2-Z-G-37.svg.pdf
index d00da7934..ca6761a2b 100644
Binary files a/static/img_javascript/ch2-Z-G-37.svg.pdf and b/static/img_javascript/ch2-Z-G-37.svg.pdf differ
diff --git a/static/img_javascript/ch2-Z-G-51.svg b/static/img_javascript/ch2-Z-G-51.svg
index d0670e805..f4b2e26ef 100644
--- a/static/img_javascript/ch2-Z-G-51.svg
+++ b/static/img_javascript/ch2-Z-G-51.svg
@@ -42,40 +42,40 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 7
- 3
- 5
- 3
- 9
- 1
- 7
- 9
- 3
- 1
- 11
- 5
- 9
- 1
- 7
- 11
- 11
- 5
+ 7
+ 3
+ 5
+ 3
+ 9
+ 1
+ 7
+ 9
+ 3
+ 1
+ 11
+ 5
+ 9
+ 1
+ 7
+ 11
+ 11
+ 5
diff --git a/static/img_javascript/ch2-Z-G-51.svg.pdf b/static/img_javascript/ch2-Z-G-51.svg.pdf
index 2fda82660..bb52657c0 100644
Binary files a/static/img_javascript/ch2-Z-G-51.svg.pdf and b/static/img_javascript/ch2-Z-G-51.svg.pdf differ
diff --git a/static/img_javascript/ch2-Z-G-54.svg b/static/img_javascript/ch2-Z-G-54.svg
index 7bc9a4dae..8ca6fd699 100644
--- a/static/img_javascript/ch2-Z-G-54.svg
+++ b/static/img_javascript/ch2-Z-G-54.svg
@@ -13,7 +13,7 @@
style="display:inline"
version="1.1"
sodipodi:docname="ch2-Z-G-54.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
width="468"
height="353">
@@ -115,27 +115,27 @@
x="200"
y="82.362183"
id="rect3796"
- style="fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:1.01467;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.01467;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
Programs that use complex numbers
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">Programs that use complex numbers
Complex-arithmetic package
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">Complex-arithmetic package
List structure and primitive machine arithmetic
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">List structure and primitive machine arithmetic
div_complex
- Polar representation
Rectangular Rectangularrepresentation
+ y="93.461372"
+ id="tspan870"
+ style="line-height:26.66666603px">representation
+ Polarrepresentation
diff --git a/static/img_javascript/ch2-Z-G-54.svg.pdf b/static/img_javascript/ch2-Z-G-54.svg.pdf
index 6d5303924..b58bd5d68 100644
Binary files a/static/img_javascript/ch2-Z-G-54.svg.pdf and b/static/img_javascript/ch2-Z-G-54.svg.pdf differ
diff --git a/static/img_javascript/ch2-Z-G-59.svg b/static/img_javascript/ch2-Z-G-59.svg
index 698bc4752..d6b2e5ad8 100644
--- a/static/img_javascript/ch2-Z-G-59.svg
+++ b/static/img_javascript/ch2-Z-G-59.svg
@@ -17,7 +17,7 @@
sodipodi:docname="ch2-Z-G-59.svg"
width="602"
height="356"
- inkscape:version="0.92.2 5c3e80d, 2017-08-06">
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
@@ -157,7 +157,7 @@
image/svg+xml
-
+
@@ -175,48 +175,48 @@
Imaginary
+ id="tspan3917"
+ style="font-size:24.4px">Imaginary
Real
+ id="tspan3921"
+ style="font-size:24.4px">Real
z z = x = x + iy + iy = re
+ style="font-style:normal;font-size:24.4px">= re
A
+ id="tspan4193"
+ style="font-size:24.4px">A
y
+ id="tspan4219"
+ style="font-size:24.4px">y
x
+ id="tspan4223"
+ style="font-size:24.4px">x
r
+ id="tspan4227"
+ style="font-size:24.4px">r
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.811739;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.811739;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.811739;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.811739;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
Programs that use rational numbers
Rational numbers in problem domain
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:0.8">Rational numbers in problem domain
add_rat sub_rat ...
Rational numbers as numerators and denominators
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:0.8">Rational numbers as numerators and denominators
make_rat numer denom
Rational numbers as pairs
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:0.8">Rational numbers as pairs
pair head tail
However pairs are implemented
+ style="fill:#000000;stroke-width:0.8;font-size:22px">However pairs are implemented
diff --git a/static/img_javascript/ch2-Z-G-6.svg.pdf b/static/img_javascript/ch2-Z-G-6.svg.pdf
index 1c65b50fd..a2c0f3760 100644
Binary files a/static/img_javascript/ch2-Z-G-6.svg.pdf and b/static/img_javascript/ch2-Z-G-6.svg.pdf differ
diff --git a/static/img_javascript/ch2-Z-G-62.svg b/static/img_javascript/ch2-Z-G-62.svg
index d7475b5fd..d428e0fca 100644
--- a/static/img_javascript/ch2-Z-G-62.svg
+++ b/static/img_javascript/ch2-Z-G-62.svg
@@ -15,7 +15,7 @@
width="669"
height="389"
sodipodi:docname="ch2-Z-G-62.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
@@ -100,7 +100,7 @@
image/svg+xml
-
+
@@ -112,7 +112,7 @@
x="-16"
y="0" />
Programs that use complex numbers
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">Programs that use complex numbers
Complex-arithmetic package
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">Complex-arithmetic package
Rectangular Rectangular representation
+ y="362.38799"
+ id="tspan31"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33329964px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east_asian:normal;fill:#000000">representation
Polar Polar representation
+ y="362.38799"
+ id="tspan44"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east_asian:normal;fill:#000000">representation
List structure and primitive machine arithmetic
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">List structure and primitive machine arithmetic
@@ -231,7 +241,7 @@
y="212.36218"
id="text3104"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.477px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">image/svg+xml
-
+
@@ -100,11 +100,11 @@
+ style="fill:none;stroke:#000000;stroke-width:1.01467252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
@@ -116,150 +116,166 @@
id="g874"
transform="matrix(1.1214098,0,0,1.1214098,-19.372682,-37.819252)">
real_part
+ x="44.332474"
+ style="font-size:19.61816278px">real_part
imag_part
+ x="44.332474"
+ style="font-size:19.61816278px">imag_part
magnitude
+ x="44.332474"
+ style="font-size:19.61816278px">magnitude
angle
+ x="44.332474"
+ style="font-size:19.61816278px">angle
real_part_polar
+ x="216.15036"
+ style="font-size:19.61816278px">real_part_polar
imag_part_polar
+ x="216.15036"
+ style="font-size:19.61816278px">imag_part_polar
magnitude_polar
+ x="216.15036"
+ style="font-size:19.61816278px">magnitude_polar
angle_polar
+ x="216.15036"
+ style="font-size:19.61816278px">angle_polar
real_part_rectangular
+ x="464.33179"
+ style="font-size:19.61816278px">real_part_rectangular
imag_part_rectangular
+ x="464.33179"
+ style="font-size:19.61816278px">imag_part_rectangular
magnitude_rectangular
+ x="464.33179"
+ style="font-size:19.61816278px">magnitude_rectangular
angle_rectangular
+ x="464.33179"
+ style="font-size:19.61816278px">angle_rectangular
Types
+ id="tspan4525"
+ style="font-size:24.4px">Types
Polar
+ id="tspan4529"
+ style="font-size:24.4px">Polar
Rectangular
+ id="tspan4533"
+ style="font-size:24.4px">Rectangular
Operations
+ id="tspan4537"
+ style="font-size:24.4px">Operations
diff --git a/static/img_javascript/ch2-Z-G-63.svg.pdf b/static/img_javascript/ch2-Z-G-63.svg.pdf
index 7eb897d52..2d512a432 100644
Binary files a/static/img_javascript/ch2-Z-G-63.svg.pdf and b/static/img_javascript/ch2-Z-G-63.svg.pdf differ
diff --git a/static/img_javascript/ch2-Z-G-64.svg b/static/img_javascript/ch2-Z-G-64.svg
index 3d7125510..7f2933c0f 100644
--- a/static/img_javascript/ch2-Z-G-64.svg
+++ b/static/img_javascript/ch2-Z-G-64.svg
@@ -13,7 +13,7 @@
style="display:inline"
version="1.1"
sodipodi:docname="ch2-Z-G-64.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
image/svg+xml
-
+
@@ -109,7 +109,7 @@
y="-4.3722725"
style="fill:#ffffff" />
add sub mul div
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">add sub mul div
add_complex
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.52382088px;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east_asian:normal;fill:#000000">add_complex
mul_complex
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.52382088px;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east_asian:normal;fill:#000000">mul_complex
sub_complex
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.52382088px;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east_asian:normal;fill:#000000">sub_complex
div_complex
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.52382088px;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east_asian:normal;fill:#000000">div_complex
Programs that use numbers
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">Programs that use numbers
Generic arithmetic package
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">Generic arithmetic package
Complex arithmetic
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.39999962px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;fill:#000000">Complex arithmetic
Rectangular
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">Rectangular
Polar
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">Polar
sub_rat
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">sub_rat
div_rat
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">div_rat
add_rat
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">add_rat
mul_rat
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">mul_rat
Rational Rationalarithmetic
- Ordinary arithmetic
+ y="421.97141"
+ id="tspan895"
+ style="line-height:29.33333397px">arithmetic
List structure and primitive machine arithmetic
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">List structure and primitive machine arithmetic
+ -- * /
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">+ -- * /
+ Ordinaryarithmetic
diff --git a/static/img_javascript/ch2-Z-G-64.svg.pdf b/static/img_javascript/ch2-Z-G-64.svg.pdf
index 44228d536..552d46f19 100644
Binary files a/static/img_javascript/ch2-Z-G-64.svg.pdf and b/static/img_javascript/ch2-Z-G-64.svg.pdf differ
diff --git a/static/img_javascript/ch2-Z-G-65.svg b/static/img_javascript/ch2-Z-G-65.svg
index fa5904555..d680280d6 100644
--- a/static/img_javascript/ch2-Z-G-65.svg
+++ b/static/img_javascript/ch2-Z-G-65.svg
@@ -53,7 +53,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.4,0,0,0.4,4,0)"
id="path4565"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -223,7 +223,7 @@
3
4
"complex"
@@ -372,7 +372,7 @@
2
[1, [[2, [[3, [4, null]], null], null]]
@@ -372,7 +372,7 @@
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.01467216;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
2
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.01467216;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.01467216;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
diff --git a/static/img_javascript/ch2-Z-G-ex-2-24.svg.pdf b/static/img_javascript/ch2-Z-G-ex-2-24.svg.pdf
index a899e1521..b402874b8 100644
Binary files a/static/img_javascript/ch2-Z-G-ex-2-24.svg.pdf and b/static/img_javascript/ch2-Z-G-ex-2-24.svg.pdf differ
diff --git a/static/img_javascript/ch2_3_4-1.pdf b/static/img_javascript/ch2_3_4-1.pdf
index cb5b58f10..89469c0d0 100644
Binary files a/static/img_javascript/ch2_3_4-1.pdf and b/static/img_javascript/ch2_3_4-1.pdf differ
diff --git a/static/img_javascript/ch2_3_4-1.svg b/static/img_javascript/ch2_3_4-1.svg
index 332f6a350..97085300c 100644
--- a/static/img_javascript/ch2_3_4-1.svg
+++ b/static/img_javascript/ch2_3_4-1.svg
@@ -1,4 +1,4 @@
-
+!
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">E1
make_withdraw:= ...
+ id="tspan5495">make_withdraw:= …
W1:=
@@ -336,19 +338,19 @@
y="99.047531"
id="text5477"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:120%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">programprogramenv
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">env
balance: 50
@@ -357,26 +359,25 @@
y="385.72888"
id="text5497"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:120%;font-family:Times;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">parameters: amountparameters: amountbody: ...
+ y="415.67059"
+ style="font-size:22px;line-height:26.66666603px">body: …
diff --git a/static/img_javascript/ch3-Z-G-10.svg.pdf b/static/img_javascript/ch3-Z-G-10.svg.pdf
index 3e86aa761..3876d096b 100644
Binary files a/static/img_javascript/ch3-Z-G-10.svg.pdf and b/static/img_javascript/ch3-Z-G-10.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-11.svg b/static/img_javascript/ch3-Z-G-11.svg
index b9676ee7b..50a239b94 100644
--- a/static/img_javascript/ch3-Z-G-11.svg
+++ b/static/img_javascript/ch3-Z-G-11.svg
@@ -13,7 +13,7 @@
style="display:inline"
version="1.1"
sodipodi:docname="ch3-Z-G-11.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
width="718.95038"
height="488.13916">
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" />
image/svg+xml
-
+
@@ -302,116 +302,116 @@
E1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">E1
programenv
+ y="169.10957"
+ id="tspan992">env
parameters: amountparameters: amountbody: ...
+ y="479.06857"
+ id="tspan996"
+ style="font-size:22px;line-height:26.66666603px">body: …
E2
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">E2
make_withdraw:= ...
+ style="fill:#000000">make_withdraw:= …
diff --git a/static/img_javascript/ch3-Z-G-11.svg.pdf b/static/img_javascript/ch3-Z-G-11.svg.pdf
index 0c917d543..061a2fbf6 100644
Binary files a/static/img_javascript/ch3-Z-G-11.svg.pdf and b/static/img_javascript/ch3-Z-G-11.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-12.svg b/static/img_javascript/ch3-Z-G-12.svg
index ce8224c57..5ed785082 100644
--- a/static/img_javascript/ch3-Z-G-12.svg
+++ b/static/img_javascript/ch3-Z-G-12.svg
@@ -13,7 +13,7 @@
style="display:inline"
version="1.1"
sodipodi:docname="ch3-Z-G-12.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
width="720"
height="821">
@@ -123,77 +123,77 @@
image/svg+xml
-
+
programenv
+ y="130.31033"
+ id="tspan930">env
sqrt:=
E2
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">E2
x: 2
is_good_enough:=
improve:= ...
+ style="fill:#000000">improve:= …
sqrt_iter:= ...
+ style="fill:#000000">sqrt_iter:= …
guess: 1
guess: 1
call to sqrt_iter
@@ -375,11 +379,11 @@
transform="matrix(1.9090888,0,0,1.9090888,-628.61581,-18.5157)">
E3
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.52382225px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">E3
call to is_good_enough
@@ -409,11 +413,11 @@
transform="matrix(1.9090888,0,0,1.9090888,-530.70682,-33.11964)">
E4
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.52382225px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">E4
parameters: guessparameters: guessbody: return abs(...) < ...;
- body: return abs(…) < …;
E1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">E1
parameters: xbody:body:function is_good_enough ...function is_good_enough …function improve ...function improve …function sqrt_iter ...function sqrt_iter …return sqrt_iter(1);
-
+ id="flowSpan116-8">return sqrt_iter(1);
diff --git a/static/img_javascript/ch3-Z-G-12.svg.pdf b/static/img_javascript/ch3-Z-G-12.svg.pdf
index 48a1bf8cf..0b122c81c 100644
Binary files a/static/img_javascript/ch3-Z-G-12.svg.pdf and b/static/img_javascript/ch3-Z-G-12.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-13.svg b/static/img_javascript/ch3-Z-G-13.svg
index bab39c313..ef5719697 100644
--- a/static/img_javascript/ch3-Z-G-13.svg
+++ b/static/img_javascript/ch3-Z-G-13.svg
@@ -58,7 +58,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.4,0,0,0.4,4,0)"
id="path4565"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
"c"
"d"
y
x
"e"
"f"
"a"
+ style="fill:none;stroke:#000000;stroke-width:1.01467;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/static/img_javascript/ch3-Z-G-13.svg.pdf b/static/img_javascript/ch3-Z-G-13.svg.pdf
index f48ee0888..41434f65d 100644
Binary files a/static/img_javascript/ch3-Z-G-13.svg.pdf and b/static/img_javascript/ch3-Z-G-13.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-14.svg b/static/img_javascript/ch3-Z-G-14.svg
index 0885c7a90..d7fdce4b8 100644
--- a/static/img_javascript/ch3-Z-G-14.svg
+++ b/static/img_javascript/ch3-Z-G-14.svg
@@ -48,7 +48,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.4,0,0,0.4,4,0)"
id="path4565"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
"c"
"d"
y
x
"e"
"f"
"a"
"b"
+ style="fill:none;stroke:#000000;stroke-width:1.01467;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/static/img_javascript/ch3-Z-G-14.svg.pdf b/static/img_javascript/ch3-Z-G-14.svg.pdf
index 38380c69c..be8cf442d 100644
Binary files a/static/img_javascript/ch3-Z-G-14.svg.pdf and b/static/img_javascript/ch3-Z-G-14.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-15.svg b/static/img_javascript/ch3-Z-G-15.svg
index 4e8a13649..f6ae73762 100644
--- a/static/img_javascript/ch3-Z-G-15.svg
+++ b/static/img_javascript/ch3-Z-G-15.svg
@@ -48,7 +48,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.4,0,0,0.4,4,0)"
id="path4565"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
"c"
"d"
y
x
"e"
"f"
"a"
"b"
+ style="fill:none;stroke:#000000;stroke-width:1.01467;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/static/img_javascript/ch3-Z-G-15.svg.pdf b/static/img_javascript/ch3-Z-G-15.svg.pdf
index 40637875e..8108d6964 100644
Binary files a/static/img_javascript/ch3-Z-G-15.svg.pdf and b/static/img_javascript/ch3-Z-G-15.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-16.svg b/static/img_javascript/ch3-Z-G-16.svg
index 7420d3476..358e7681f 100644
--- a/static/img_javascript/ch3-Z-G-16.svg
+++ b/static/img_javascript/ch3-Z-G-16.svg
@@ -48,7 +48,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.4,0,0,0.4,4,0)"
id="path4565"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
"c"
"d"
y
x
"e"
"f"
"a"
+ style="fill:none;stroke:#000000;stroke-width:1.01467;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/static/img_javascript/ch3-Z-G-16.svg.pdf b/static/img_javascript/ch3-Z-G-16.svg.pdf
index 7a5916f3c..bbcafadee 100644
Binary files a/static/img_javascript/ch3-Z-G-16.svg.pdf and b/static/img_javascript/ch3-Z-G-16.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-17.svg b/static/img_javascript/ch3-Z-G-17.svg
index 707510220..150fb16f6 100644
--- a/static/img_javascript/ch3-Z-G-17.svg
+++ b/static/img_javascript/ch3-Z-G-17.svg
@@ -53,7 +53,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.4,0,0,0.4,4,0)"
id="path4565"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -204,7 +204,7 @@
x="187.67584"
y="47.575085"
id="rect3794-7-1-0"
- style="fill:none;fill-opacity:1;stroke:#383838;stroke-width:1.01467454;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01467454;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01467454;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01467454;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
z1
@@ -310,7 +310,7 @@
y="172.68875"
id="text4974-8"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#383838;fill-opacity:1;stroke:none">x
@@ -319,7 +319,7 @@
y="173.0863"
id="text3007-0-2-9"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
z2
@@ -405,7 +405,7 @@
y="32.758873"
id="text3007-0-2-9-2"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">"b"
"a"
@@ -213,7 +213,7 @@
x="171.76981"
y="58.938553"
id="rect3794-7-1-0-5-6-9"
- style="fill:none;fill-opacity:1;stroke:#383838;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
front_ptr
@@ -349,7 +349,7 @@
y="87.745369"
id="text4974"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">q
@@ -358,7 +358,7 @@
y="213.0863"
id="text3007-0-2-9-5"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">rear_ptr
diff --git a/static/img_javascript/ch3-Z-G-19.svg.pdf b/static/img_javascript/ch3-Z-G-19.svg.pdf
index b47109f07..ae525a547 100644
Binary files a/static/img_javascript/ch3-Z-G-19.svg.pdf and b/static/img_javascript/ch3-Z-G-19.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-2.svg b/static/img_javascript/ch3-Z-G-2.svg
index 36dca65d1..15968892b 100644
--- a/static/img_javascript/ch3-Z-G-2.svg
+++ b/static/img_javascript/ch3-Z-G-2.svg
@@ -1,23 +1,95 @@
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- A
- B
- C
-
- D
- I
- II
- III
- z:6
- x:7
- m:1
- y:2
- x:3
- y:5
+
+
+ II
+ z: 6
+ x: 7
+ m: 1
+ y: 2
+ x: 3
+ y: 5
+ III
+ I
+ A
+ B
+ C
+ D
diff --git a/static/img_javascript/ch3-Z-G-2.svg.pdf b/static/img_javascript/ch3-Z-G-2.svg.pdf
index 7937cc859..3d6d6e300 100644
Binary files a/static/img_javascript/ch3-Z-G-2.svg.pdf and b/static/img_javascript/ch3-Z-G-2.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-20.svg b/static/img_javascript/ch3-Z-G-20.svg
index 5b14b3904..80329f108 100644
--- a/static/img_javascript/ch3-Z-G-20.svg
+++ b/static/img_javascript/ch3-Z-G-20.svg
@@ -53,7 +53,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.4,0,0,0.4,4,0)"
id="path4565"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -226,7 +226,7 @@
id="layer2"
transform="translate(-52.053307,-53.4375)">
@@ -355,7 +355,7 @@
y="97.137833"
id="text7335"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">front_ptr
@@ -364,7 +364,7 @@
y="34.308334"
id="text4974"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">q
@@ -373,7 +373,7 @@
y="159.6488"
id="text3007-0-2-9-5"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -226,7 +226,7 @@
id="layer2"
transform="translate(-72.053307,-56.28125)">
@@ -355,7 +355,7 @@
y="85.696701"
id="text7335"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">front_ptr
@@ -364,7 +364,7 @@
y="34.321732"
id="text4974"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">q
@@ -373,7 +373,7 @@
y="159.66217"
id="text3007-0-2-9-5"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -361,7 +361,7 @@
x="-0.032898188"
y="156.91037"
id="rect3794-7-1-0-5-6"
- style="fill:none;fill-opacity:1;stroke:#383838;stroke-width:1.01467204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01467204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01467204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01467204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01467204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01467204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01467204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01467204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
table
diff --git a/static/img_javascript/ch3-Z-G-22.svg.pdf b/static/img_javascript/ch3-Z-G-22.svg.pdf
index 8a59e9c47..c2b4bbacc 100644
Binary files a/static/img_javascript/ch3-Z-G-22.svg.pdf and b/static/img_javascript/ch3-Z-G-22.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-23.svg b/static/img_javascript/ch3-Z-G-23.svg
index f25ce6cc2..643f32bce 100644
--- a/static/img_javascript/ch3-Z-G-23.svg
+++ b/static/img_javascript/ch3-Z-G-23.svg
@@ -52,7 +52,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.4,0,0,0.4,4,0)"
id="path4565"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -538,7 +538,7 @@
x="0"
y="0" />
"+"
"-"
"*"
43
45
42
"*table*"
"a"
"b"
97
98
"letters"
"math"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
other names
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">other names
square:=
@@ -270,51 +270,57 @@
y="104.02728"
id="text5477"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.0667px;line-height:120%;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">programprogramenv
+ y="129.42934"
+ id="tspan918">env
parameters: xparameters: xbody: return x * x;
+ y="356.67233"
+ style="line-height:26.66666603px">body: return x * x;
globalenv
+ y="-26.130093"
+ id="tspan910">env
pair:= ...
+ id="tspan5475-5">pair:= …
other names of primitives
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">other names of primitives
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
-
+
+
+ style="fill:none;stroke:#000000;stroke-width:1.48818922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend);display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.5905512;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.5905512;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.5905512;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467454;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467454;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467454;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467454;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467454;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467454;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818922;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818922;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818922;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818922;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818922;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);marker-end:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818922;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);marker-end:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818922;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
Peter
+ id="tspan3944"
+ style="font-size:24.4px;">Peter
Access balance: $100
+ id="tspan3968"
+ style="font-size:24.4px">Access balance: $100
new value: 100 – 10 = 90
+ id="tspan3972"
+ style="font-size:24.4px">new value: 100 – 10 = 90
update balance to $90
+ id="tspan3976"
+ style="font-size:24.4px">update balance to $90
time
+ id="tspan4043"
+ style="font-size:24.4px">time
Bank
+ id="tspan3948"
+ style="font-size:24.4px">Bank
Paul
+ id="tspan3952"
+ style="font-size:24.4px">Paul
$100
+ style="text-align:center;text-anchor:middle;font-size:24.4px">$100
$90
+ style="text-align:center;text-anchor:middle;font-size:24.4px">$90
$75
+ style="text-align:center;text-anchor:middle;font-size:24.4px">$75
Access balance: $100
+ id="tspan3968-6"
+ style="font-size:24.4px">Access balance: $100
new value: 100 – 25 = 75
+ id="tspan3972-1"
+ style="font-size:24.4px">new value: 100 – 25 = 75
update balance to $75
+ id="tspan3976-1"
+ style="font-size:24.4px">update balance to $75
diff --git a/static/img_javascript/ch3-Z-G-31.svg.pdf b/static/img_javascript/ch3-Z-G-31.svg.pdf
index 0345bc966..5dfbdecd8 100644
Binary files a/static/img_javascript/ch3-Z-G-31.svg.pdf and b/static/img_javascript/ch3-Z-G-31.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-35.svg b/static/img_javascript/ch3-Z-G-35.svg
index 3ecc833f1..11f84e978 100644
--- a/static/img_javascript/ch3-Z-G-35.svg
+++ b/static/img_javascript/ch3-Z-G-35.svg
@@ -8,12 +8,12 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
preserveAspectRatio="xMinYMin meet"
- viewBox="0 0 756.55964 256.01437"
+ viewBox="0 0 823.09883 256.01437"
id="svg7429"
version="1.1"
sodipodi:docname="ch3-Z-G-35.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
- width="756.55963"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+ width="823.09882"
height="256.01437">
@@ -219,81 +219,79 @@
+ width="175.84441"
+ ry="6.7644892"
+ rx="6.7644892" />
+ d="m 163.13018,69.439012 c 5.72727,-1.90909 9.54544,1.90909 9.54544,6.7645 v 91.470938 c 0,4.85539 -3.81817,8.67356 -9.54544,6.76447 L 60.039366,128.62078 c -7.63635,-3.81818 -7.63635,-9.54545 0,-13.36363 z" />
+ d="m 172.67562,145.80259 h 43.90905" />
+ d="m 395.9936,172.77224 30.93179,-0.42412"
+ sodipodi:nodetypes="cc" />
+ d="M 0.85760404,121.87079 H 50.493926" />
+ d="M 258.58464,98.961722 V 118.53473" />
+ d="m 260.32327,98.075372 a 1.90909,1.90909 0 1 1 -3.81818,0 1.90909,1.90909 0 1 1 3.81818,0 z" />
filter:
-
-! is_divisible
+ y="152.32532"
+ x="229.49374">filter:
+
+!is_divisible
+ transform="translate(33.454953,-59.042127)">
sieve
+ x="414.03879"
+ style="font-size:22.93333244px">sieve
sieve
+ y="40.598206"
+ x="52.539352"
+ style="font-size:22.93333244px">sieve
head
+ x="169.98412"
+ style="font-size:22.93333244px">head
tail
+ x="169.98412"
+ style="font-size:22.93333244px">tail
+ transform="matrix(1.9090892,0,0,1.9090892,-113.41498,-178.27486)">
pair
+ y="159.31456"
+ x="396.71436"
+ style="font-size:12.01270962px">pair
diff --git a/static/img_javascript/ch3-Z-G-35.svg.pdf b/static/img_javascript/ch3-Z-G-35.svg.pdf
index c1deaad91..9a12235d4 100644
Binary files a/static/img_javascript/ch3-Z-G-35.svg.pdf and b/static/img_javascript/ch3-Z-G-35.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-4.svg b/static/img_javascript/ch3-Z-G-4.svg
index 9f55b9b6e..c39243211 100644
--- a/static/img_javascript/ch3-Z-G-4.svg
+++ b/static/img_javascript/ch3-Z-G-4.svg
@@ -25,15 +25,15 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="1914"
- inkscape:window-height="2125"
+ inkscape:window-width="3840"
+ inkscape:window-height="2160"
id="namedview51"
showgrid="false"
- inkscape:zoom="1.488959"
- inkscape:cx="261.20092"
+ inkscape:zoom="2.977918"
+ inkscape:cx="112.10346"
inkscape:cy="165.81954"
inkscape:window-x="0"
- inkscape:window-y="32"
+ inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="layer7"
fit-margin-top="0"
@@ -53,7 +53,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path3809-6-2"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" />
E1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">E1
return x * x;
parameters: xparameters: xbody: return x * x;
programenv
other names
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">other names
square:=
@@ -353,9 +355,9 @@
y="119.42351"
id="text6297"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;display:inline;fill:#383838;fill-opacity:1;stroke:none">x:5
+ id="tspan6299">x: 5
diff --git a/static/img_javascript/ch3-Z-G-4.svg.pdf b/static/img_javascript/ch3-Z-G-4.svg.pdf
index 28680d411..7e884440d 100644
Binary files a/static/img_javascript/ch3-Z-G-4.svg.pdf and b/static/img_javascript/ch3-Z-G-4.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-49.svg b/static/img_javascript/ch3-Z-G-49.svg
index 01f495440..a29bd44a3 100644
--- a/static/img_javascript/ch3-Z-G-49.svg
+++ b/static/img_javascript/ch3-Z-G-49.svg
@@ -49,7 +49,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818827;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818827;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:5.95275287, 5.95275287;stroke-dashoffset:0;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818827;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818827;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818827;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.0629921;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.48909009;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker-end:url(#Arrow1Mend);display:inline" />
add
@@ -258,7 +258,7 @@
y="243.51898"
id="text9178"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">pair
@@ -267,7 +267,7 @@
y="147.00774"
id="text10580"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">initial_value
@@ -276,7 +276,7 @@
y="223.37134"
id="text10576"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">integral
@@ -285,7 +285,7 @@
y="243.48489"
id="text8815"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">scale: input
diff --git a/static/img_javascript/ch3-Z-G-49.svg.pdf b/static/img_javascript/ch3-Z-G-49.svg.pdf
index 9176eb679..18724b87c 100644
Binary files a/static/img_javascript/ch3-Z-G-49.svg.pdf and b/static/img_javascript/ch3-Z-G-49.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-5.svg b/static/img_javascript/ch3-Z-G-5.svg
index b6eb6c58e..6e32079ec 100644
--- a/static/img_javascript/ch3-Z-G-5.svg
+++ b/static/img_javascript/ch3-Z-G-5.svg
@@ -34,8 +34,8 @@
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="3.5272064"
- inkscape:cx="397.20715"
- inkscape:cy="205.6592"
+ inkscape:cx="384.73269"
+ inkscape:cy="182.97836"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
@@ -53,7 +53,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path3809-6-2"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -241,138 +241,138 @@
square:=
@@ -393,7 +393,7 @@
y="93.847099"
id="text5493"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">sum_of_squares:=
@@ -402,7 +402,7 @@
y="161.47377"
id="text5473"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">f:=
@@ -411,43 +411,43 @@
y="143.97375"
id="text5477"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.0667px;line-height:120%;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">programprogramenv
+ y="169.25375"
+ style="font-size:22px">env
parameters: parameters: xbody: body: return x * x;
parameters: parameters: x, ybody: return square(x) +
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:26.66666603px;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start" />
parameters: aparameters: abody: return sum_of_squares(a + 1, a + 2);
square(y);
+ x="471.52341"
+ y="389.71985"> square(y);
diff --git a/static/img_javascript/ch3-Z-G-5.svg.pdf b/static/img_javascript/ch3-Z-G-5.svg.pdf
index 61d6a5bd8..b25930488 100644
Binary files a/static/img_javascript/ch3-Z-G-5.svg.pdf and b/static/img_javascript/ch3-Z-G-5.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-6.svg b/static/img_javascript/ch3-Z-G-6.svg
index 0550eb477..b4a621d97 100644
--- a/static/img_javascript/ch3-Z-G-6.svg
+++ b/static/img_javascript/ch3-Z-G-6.svg
@@ -12,7 +12,7 @@
id="svg3170"
version="1.1"
sodipodi:docname="ch3-Z-G-6.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
width="645"
height="374.36209">
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
image/svg+xml
-
+
@@ -265,77 +265,77 @@
x * x
@@ -356,26 +356,26 @@
y="238.62122"
id="text6297-4"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">x:10
+ id="tspan6299-6">x: 10
E4
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal">E4
x * x
@@ -384,26 +384,26 @@
y="238.62122"
id="text6297"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">x:6
+ id="tspan6299">x: 6
E3
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal">E3
x:6
+ id="tspan6299-83">x: 6
y:10
+ id="tspan6299-9-9">y: 10
E2
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal">E2
a:5
+ id="tspan6299-8">a: 5
E1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal">E1
programprogramenv
+ y="147.98543"
+ style="font-size:22px;line-height:24px">env
@@ -150,7 +150,7 @@
image/svg+xml
-
+
@@ -161,57 +161,57 @@
+ style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:24px;line-height:120.00000477%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none" />
programenv
make_withdraw:=
@@ -260,16 +260,16 @@
id="tspan976"
x="76.863731"
y="253.80219"
- style="line-height:100%">parameters: balanceparameters: balancebody:
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;line-height:26.66666603px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">body:
return amount => { if (balance >= amount) { balance = balance - amount; return balance; } else { return "insufficient funds"; } };
diff --git a/static/img_javascript/ch3-Z-G-7.svg.pdf b/static/img_javascript/ch3-Z-G-7.svg.pdf
index d98711caf..ca1283379 100644
Binary files a/static/img_javascript/ch3-Z-G-7.svg.pdf and b/static/img_javascript/ch3-Z-G-7.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-8.svg b/static/img_javascript/ch3-Z-G-8.svg
index 8ebb06ef7..043975f7d 100644
--- a/static/img_javascript/ch3-Z-G-8.svg
+++ b/static/img_javascript/ch3-Z-G-8.svg
@@ -13,7 +13,7 @@
style="display:inline"
version="1.1"
sodipodi:docname="ch3-Z-G-8.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
width="699.03925"
height="511.65997">
@@ -213,7 +213,7 @@
image/svg+xml
-
+
@@ -222,108 +222,109 @@
id="layer2"
style="display:inline">
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467562;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssssss" />
E1
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal">E1
make_withdraw:=
@@ -354,7 +355,7 @@
y="136.82968"
id="text5473"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">W1:=
@@ -363,23 +364,23 @@
y="119.07627"
id="text5477"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:120%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">programenv
+ y="144.90308"
+ id="tspan958">env
balance: 100
@@ -388,86 +389,89 @@
y="331.6936"
id="text5497-1"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.8182px;line-height:120%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;white-space:pre;inline-size:212.418;fill:#383838;fill-opacity:1;stroke:none">parameters: balance
-parameters: balancebody: ...
+ y="361.47543"
+ id="tspan962">body: …
parameters: amountparameters: amountbody:
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;line-height:26.66666603px;font-family:Times;-inkscape-font-specification:Times"
+ x="72.240707"
+ y="384.09845"
+ id="tspan970">body:
if (balance >= amount) { balance = balance - amount; return balance; } else { return "insufficient funds"; }
diff --git a/static/img_javascript/ch3-Z-G-8.svg.pdf b/static/img_javascript/ch3-Z-G-8.svg.pdf
index 74e7afded..7e20eeadd 100644
Binary files a/static/img_javascript/ch3-Z-G-8.svg.pdf and b/static/img_javascript/ch3-Z-G-8.svg.pdf differ
diff --git a/static/img_javascript/ch3-Z-G-9.svg b/static/img_javascript/ch3-Z-G-9.svg
index 3be4e8941..ca4ee6df8 100644
--- a/static/img_javascript/ch3-Z-G-9.svg
+++ b/static/img_javascript/ch3-Z-G-9.svg
@@ -13,7 +13,7 @@
style="display:inline"
version="1.1"
sodipodi:docname="ch3-Z-G-9.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
width="701.03882"
height="502.02853">
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none" />
image/svg+xml
-
+
@@ -243,107 +243,84 @@
- parameters: amountbody: …
make_withdraw:= ...
@@ -362,46 +339,30 @@
y="118.66006"
id="text5473"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">W1:=
- programenv
balance: 100
amount: 50
@@ -409,7 +370,7 @@
return "insufficient funds";}
- }
@@ -528,30 +488,30 @@
id="g1027"
transform="translate(2.272848,1.3026384)">
parameters: parameters: amountbody: …
+ x="59.80368">body: …
E1
make_withdraw:= ...
+ x="144.62189">make_withdraw:= …
W1:=
programenv
balance: 100
amount: 50
Here is the balance
-Here is the balance that will be changed
-that will be changed by the assignment
+ y="87.319778"
+ id="tspan1026">by the assignment
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+ inkscape:current-layer="svg5876"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
image/svg+xml
+
-
+
+ d="M 0.51456157,21.842278 H 113.15065"
+ inkscape:connector-curvature="0" />
Operation
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.39999962px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">Operation
var q = make_queue();var q = make_queue();insert_queue(q, "a");insert_queue(q, "a");insert_queue(q, "b");insert_queue(q, "b");delete_queue(q);delete_queue(q);insert_queue(q, "c");insert_queue(q, "c");insert_queue(q, "d");insert_queue(q, "d");delete_queue(q);
+ x="2.5326161"
+ y="230.32214"
+ id="tspan865"
+ style="font-size:20px">delete_queue(q);
+ transform="translate(281.27298,-47.266729)">
aaa ba bbbb cb cb c db c dc d
+ y="230.32214"
+ x="344.53262"
+ style="font-size:20px">c d
diff --git a/static/img_javascript/ch3.18.svg.pdf b/static/img_javascript/ch3.18.svg.pdf
index f2d00b21a..dad752b96 100644
Binary files a/static/img_javascript/ch3.18.svg.pdf and b/static/img_javascript/ch3.18.svg.pdf differ
diff --git a/static/img_javascript/ch4-Z-G-1.svg b/static/img_javascript/ch4-Z-G-1.svg
index 57db0c9ac..3e099a7dd 100644
--- a/static/img_javascript/ch4-Z-G-1.svg
+++ b/static/img_javascript/ch4-Z-G-1.svg
@@ -12,7 +12,7 @@
id="svg2"
version="1.1"
sodipodi:docname="ch4-Z-G-1.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
width="699"
height="284">
@@ -155,12 +155,12 @@
d="m 320,137.36218 a 75,75 0 1 1 -150,0 75,75 0 1 1 150,0 z"
transform="matrix(1.6545448,0,0,1.6545448,-38.528544,-23.742)"
id="path3768"
- style="fill:none;stroke:#383838;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
inkscape:connector-curvature="0" />
Function, Function, Arguments
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000">Arguments
Expression, Expression,Environment
+ y="232.3663"
+ id="tspan876"
+ style="font-size:22px">Environment
diff --git a/static/img_javascript/ch4-Z-G-1.svg.pdf b/static/img_javascript/ch4-Z-G-1.svg.pdf
index 0e884d0b7..8ff0d5818 100644
Binary files a/static/img_javascript/ch4-Z-G-1.svg.pdf and b/static/img_javascript/ch4-Z-G-1.svg.pdf differ
diff --git a/static/img_javascript/ch4-Z-G-3.svg b/static/img_javascript/ch4-Z-G-3.svg
index e77e1be76..55943c9c1 100644
--- a/static/img_javascript/ch4-Z-G-3.svg
+++ b/static/img_javascript/ch4-Z-G-3.svg
@@ -15,7 +15,7 @@
id="svg2"
version="1.1"
sodipodi:docname="ch4-Z-G-3.svg"
- inkscape:version="0.92.3 (2405546, 2018-03-11)">
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
-
+
+
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
function factorial(n) {function factorial(n) { return n === 1 return n === 1 ? 1 ? 1 : factorial(n - 1) * n; : factorial(n - 1) * n;}
+ y="339.68591"
+ style="-inkscape-font-specification:'Latin Modern Mono';font-family:'Latin Modern Mono';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">}
eval
@@ -215,7 +229,7 @@
y="104.58688"
id="text4080"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">6
@@ -224,7 +238,7 @@
y="104.58688"
id="text4084"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">720
diff --git a/static/img_javascript/ch4-Z-G-3.svg.pdf b/static/img_javascript/ch4-Z-G-3.svg.pdf
index a75871fff..91ec88e06 100644
Binary files a/static/img_javascript/ch4-Z-G-3.svg.pdf and b/static/img_javascript/ch4-Z-G-3.svg.pdf differ
diff --git a/static/img_javascript/ch4-parse-abstraction.svg b/static/img_javascript/ch4-parse-abstraction.svg
index 9bfe03480..d49305260 100644
--- a/static/img_javascript/ch4-parse-abstraction.svg
+++ b/static/img_javascript/ch4-parse-abstraction.svg
@@ -7,7 +7,7 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
sodipodi:docname="ch4-parse-abstraction.svg"
version="1.1"
style="display:inline"
@@ -19,15 +19,15 @@
inkscape:document-rotation="0"
inkscape:current-layer="svg2987"
inkscape:window-maximized="0"
- inkscape:window-y="25"
- inkscape:window-x="69"
+ inkscape:window-y="0"
+ inkscape:window-x="0"
inkscape:cy="224.36385"
- inkscape:cx="379.83357"
- inkscape:zoom="1.0338029"
+ inkscape:cx="304.08211"
+ inkscape:zoom="2.9240362"
showgrid="false"
id="namedview62"
- inkscape:window-height="847"
- inkscape:window-width="1440"
+ inkscape:window-height="2160"
+ inkscape:window-width="3840"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
guidetolerance="10"
@@ -105,23 +105,23 @@
x="108.34057"
y="54.172485"
id="rect3796"
- style="fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:1.32177;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.32177;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
Evaluator
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000">Evaluator
Tagged-list representation
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000">Tagged-list representation
Program text, represented by JavaScript strings
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000">Program text, represented by JavaScript strings
Logic programming query system
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000">Logic programming query system
Query-language-specific representation
+ y="138.65857"
+ id="tspan27"
+ style="font-size:22px">Query-language-specific representation
JavaScript syntax representation
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000">JavaScript syntax representation
Assertions, rules, queries, as strings
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000">Assertions, rules, queries, as strings
@@ -358,13 +359,15 @@
y="103.47907"
id="text5873"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">type, contents, is_rule, first_conjunct, …
+ style="fill:#000000">type, contents, is_rule, first_conjunct, …
query_syntax_process
+ width="900">
image/svg+xml
-
+
@@ -197,47 +196,50 @@
width="100%" />
Logic programming query system
+ y="27.38826"
+ id="tspan3006"
+ style="font-size:20.39999962px">Logic programming query system
Query-language-specific representation
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81819916px;line-height:125%;font-family:Times;-inkscape-font-specification:Times;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;white-space:pre;fill:#000000;fill-opacity:1;stroke:none">Query-language-specific representation
JavaScript syntax representation
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81819916px;line-height:125%;font-family:Times;-inkscape-font-specification:Times;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;white-space:pre;fill:#000000;fill-opacity:1;stroke:none">JavaScript syntax representation
Assertions, rules, queries, as strings
+ y="470.14389"
+ id="tspan6349-9"
+ style="font-size:20.39999962px">Assertions, rules, queries, as strings
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.18719;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
is_assertion, rename_variables_in, …
unparse_query
is_application, arg_expressions, …
Logic programming query system
+ y="39.38826"
+ id="tspan3006"
+ style="font-size:20.39999962px">Logic programming query system
Tagged-list representation
-of query syntax
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81819916px;line-height:125%;font-family:Times;-inkscape-font-specification:Times;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;white-space:pre;fill:#000000;fill-opacity:1;stroke:none">Tagged-list representationof query syntax
Tagged-list representation
-of JavaScript syntax
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81819916px;line-height:125%;font-family:Times;-inkscape-font-specification:Times;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;white-space:pre;fill:#000000;fill-opacity:1;stroke:none">Tagged-list representationof JavaScript syntax
Assertions, rules, queries, as strings
+ y="460.14389"
+ id="tspan6349-9"
+ style="font-size:20.39999962px">Assertions, rules, queries, as strings
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.18719;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
is_assertion, rename_variables_in, …
unparse_query
is_application, arg_expressions, …
+ width="900">
image/svg+xml
-
+
@@ -197,64 +196,49 @@
width="100%" />
Logic programming query system
+ y="27.38826"
+ id="tspan3006"
+ style="font-size:20.39999962px;line-height:24px">Logic programming query system
Tagged-list representation
-of query syntax
+ id="tspan2615"
+ style="font-size:20.39999962px;line-height:89.99999762%" />
Tagged-list representation
-of JavaScript syntax
+ id="tspan2630"
+ style="font-size:20.39999962px" />
Assertions, rules, queries, as strings
+ id="tspan6349-9"
+ style="font-size:20.4px">Assertions, rules, queries, as strings
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.18719;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
is_assertion, rename_variables_in, …
unparse_query
is_application, arg_expressions, …
+ Tagged-list representation of JavaScript syntax
+ Tagged-list representation of query syntax
diff --git a/static/img_javascript/ex1-14.svg.pdf b/static/img_javascript/ex1-14.svg.pdf
index 8cb14f74e..296f941ae 100644
Binary files a/static/img_javascript/ex1-14.svg.pdf and b/static/img_javascript/ex1-14.svg.pdf differ
diff --git a/static/img_javascript/preserving_table.svg.pdf b/static/img_javascript/preserving_table.svg.pdf
index 5daf2da07..00f2d5a88 100644
Binary files a/static/img_javascript/preserving_table.svg.pdf and b/static/img_javascript/preserving_table.svg.pdf differ
diff --git a/static/img_original/527table.svg.pdf b/static/img_original/527table.svg.pdf
index 07c968f1f..7410c67c6 100644
Binary files a/static/img_original/527table.svg.pdf and b/static/img_original/527table.svg.pdf differ
diff --git a/static/img_original/Fig2.10.std.svg b/static/img_original/Fig2.10.std.svg
index 00be211c2..810667995 100644
--- a/static/img_original/Fig2.10.std.svg
+++ b/static/img_original/Fig2.10.std.svg
@@ -42,43 +42,43 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/static/img_original/Fig2.10.std.svg.pdf b/static/img_original/Fig2.10.std.svg.pdf
index 50daeda95..a62e33d5a 100644
Binary files a/static/img_original/Fig2.10.std.svg.pdf and b/static/img_original/Fig2.10.std.svg.pdf differ
diff --git a/static/img_original/Fig2.11.std.svg.pdf b/static/img_original/Fig2.11.std.svg.pdf
index 5b23dfb86..5acc5cb2c 100644
Binary files a/static/img_original/Fig2.11.std.svg.pdf and b/static/img_original/Fig2.11.std.svg.pdf differ
diff --git a/static/img_original/Fig2.12.std.svg b/static/img_original/Fig2.12.std.svg
index 9fbe8de16..836848ddf 100644
--- a/static/img_original/Fig2.12.std.svg
+++ b/static/img_original/Fig2.12.std.svg
@@ -102,27 +102,27 @@
transform="matrix(0.50000008,0,0,0.96975243,653.6916,-196.92209)">
@@ -131,27 +131,27 @@
transform="matrix(0.50000008,0,0,-0.96975243,775.00009,602.85996)">
@@ -167,27 +167,27 @@
transform="matrix(0.50000008,0,0,0.96975243,653.6916,-196.92209)">
@@ -196,27 +196,27 @@
transform="matrix(0.50000008,0,0,-0.96975243,775.00009,602.85996)">
@@ -229,27 +229,27 @@
transform="matrix(0.50000008,0,0,0.96975243,653.6916,-196.92209)">
@@ -258,27 +258,27 @@
transform="matrix(0.50000008,0,0,-0.96975243,775.00009,602.85996)">
diff --git a/static/img_original/Fig2.12.std.svg.pdf b/static/img_original/Fig2.12.std.svg.pdf
index 565be5d6e..353758a00 100644
Binary files a/static/img_original/Fig2.12.std.svg.pdf and b/static/img_original/Fig2.12.std.svg.pdf differ
diff --git a/static/img_original/Fig2.14b.std.svg b/static/img_original/Fig2.14b.std.svg
index feb09f9c5..224daee2a 100644
--- a/static/img_original/Fig2.14b.std.svg
+++ b/static/img_original/Fig2.14b.std.svg
@@ -96,28 +96,28 @@
x="50"
y="42.362183"
id="rect95020"
- style="fill:none;stroke:#383838;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
(right-split wave 5)
(right-split rogers 5)
(corner-split wave 5)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- $100
- $7
- $5
- $300
- $0
- $305
- $305
- $25
- $65
- $17
- $17
- $90
- W
- W
- D
- time
- Peter
- Bank1
- Paul
- Bank2
+
+ $100
+ $7
+ $5
+ $300
+ $0
+ $305
+ $305
+ $25
+ $65
+ $17
+ $17
+ $90
+ W
+ W
+ D
+ time
+ Peter
+ Bank1
+ Paul
+ Bank2
diff --git a/static/img_original/Fig3.30.svg.pdf b/static/img_original/Fig3.30.svg.pdf
index f4290c71b..ddf205873 100644
Binary files a/static/img_original/Fig3.30.svg.pdf and b/static/img_original/Fig3.30.svg.pdf differ
diff --git a/static/img_original/Fig4.4a.std.svg b/static/img_original/Fig4.4a.std.svg
index 74968fd1b..99c3114a0 100644
--- a/static/img_original/Fig4.4a.std.svg
+++ b/static/img_original/Fig4.4a.std.svg
@@ -4,13 +4,13 @@
-
+
-
+
-
+
@@ -52,16 +52,16 @@
-->
-
-
-
-
+
+
+
+
- input streamof frames
- output stream of frames,filtered and extended
- query
- (job ?x ?y)
- stream of assertionsfrom data base
+ input streamof frames
+ output stream of frames,filtered and extended
+ query
+ (job ?x ?y)
+ stream of assertionsfrom data base
diff --git a/static/img_original/Fig4.4a.std.svg.pdf b/static/img_original/Fig4.4a.std.svg.pdf
index 1c501a2e5..a52363d3d 100644
Binary files a/static/img_original/Fig4.4a.std.svg.pdf and b/static/img_original/Fig4.4a.std.svg.pdf differ
diff --git a/static/img_original/Fig4.5a.std.svg b/static/img_original/Fig4.5a.std.svg
index 4bbf43aed..2d5159af6 100644
--- a/static/img_original/Fig4.5a.std.svg
+++ b/static/img_original/Fig4.5a.std.svg
@@ -4,19 +4,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -61,26 +61,26 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
- (and A B)
- data base
- input streamof frames
- output streamof frames
- A
- B
+ (and A B)
+ data base
+ input streamof frames
+ output streamof frames
+ A
+ B
diff --git a/static/img_original/Fig4.5a.std.svg.pdf b/static/img_original/Fig4.5a.std.svg.pdf
index d5444bff2..40fcaddc7 100644
Binary files a/static/img_original/Fig4.5a.std.svg.pdf and b/static/img_original/Fig4.5a.std.svg.pdf differ
diff --git a/static/img_original/Fig4.6a.std.svg b/static/img_original/Fig4.6a.std.svg
index 2ddf24cc1..629125f21 100644
--- a/static/img_original/Fig4.6a.std.svg
+++ b/static/img_original/Fig4.6a.std.svg
@@ -4,40 +4,40 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -80,41 +80,41 @@
-->
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
- merge
+ merge
-
+
- A
+ A
-
- B
+
+ B
- (or A B)
- data base
- input streamof frames
- output streamof frames
+ (or A B)
+ data base
+ input streamof frames
+ output streamof frames
diff --git a/static/img_original/Fig4.6a.std.svg.pdf b/static/img_original/Fig4.6a.std.svg.pdf
index 076fbf7eb..1ad67ffda 100644
Binary files a/static/img_original/Fig4.6a.std.svg.pdf and b/static/img_original/Fig4.6a.std.svg.pdf differ
diff --git a/static/img_original/Fig5.11b.std.svg b/static/img_original/Fig5.11b.std.svg
index 6dae7d152..90bea794e 100644
--- a/static/img_original/Fig5.11b.std.svg
+++ b/static/img_original/Fig5.11b.std.svg
@@ -47,7 +47,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.8,0,0,0.8,10,0)"
id="path5443"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
@@ -642,7 +642,7 @@
y="368.23944"
id="text5280"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">after-fact-
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.0909px;line-height:130%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none" />
1
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.01467;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
=
@@ -701,13 +701,13 @@
x="30"
y="82.362183"
id="rect6788-7-2-7-4-3"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
val
@@ -724,13 +724,13 @@
x="180"
y="82.362183"
id="rect6788-7-2-7-4-3-3"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
n
@@ -747,13 +747,13 @@
x="290"
y="82.362183"
id="rect6788-7-2-7-4-3-0"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
stack
@@ -763,7 +763,7 @@
y="270.0137"
id="text6689-7-1-4"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">continue
@@ -772,7 +772,7 @@
y="270.91382"
id="text6689-7-1-3-1-1"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">*
@@ -781,7 +781,7 @@
y="270.23572"
id="text6689-7-1-3-1-1-3"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">sn
@@ -800,7 +800,7 @@
y="174.69824"
id="text4978"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">rn
@@ -809,7 +809,7 @@
y="202.14865"
id="text5268"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;display:inline;fill:#383838;fill-opacity:1;stroke:none">sc
@@ -818,7 +818,7 @@
y="202.14865"
id="text5272"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#383838;fill-opacity:1;stroke:none">rc
@@ -827,7 +827,7 @@
y="268.9668"
id="text5316"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;display:inline;fill:#383838;fill-opacity:1;stroke:none">controller
diff --git a/static/img_original/Fig5.11b.std.svg.pdf b/static/img_original/Fig5.11b.std.svg.pdf
index 1a4b6c5f8..26aaab3b8 100644
Binary files a/static/img_original/Fig5.11b.std.svg.pdf and b/static/img_original/Fig5.11b.std.svg.pdf differ
diff --git a/static/img_original/Fig5.14b.std.svg b/static/img_original/Fig5.14b.std.svg
index 1b52eaba3..58862c45d 100644
--- a/static/img_original/Fig5.14b.std.svg
+++ b/static/img_original/Fig5.14b.std.svg
@@ -47,7 +47,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
transform="matrix(0.4,0,0,0.4,4,0)"
id="path4565-5"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+---+---+ +---+ +---+---+ +---+---+ +---+---+ +---+
+ style="fill:none;stroke:#000000;stroke-width:0.88582677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
@@ -595,66 +595,66 @@
x="220"
y="162.36218"
id="rect3794-7"
- style="fill:none;stroke:#383838;stroke-width:0.88582677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:0.88582677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:0.88582677;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.88582677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.88582677;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467383;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467383;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
0
@@ -674,7 +674,7 @@
y="444.48428"
id="text7706"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">1
@@ -683,7 +683,7 @@
y="444.48428"
id="text7710"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">2
@@ -692,7 +692,7 @@
y="444.48428"
id="text7714"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">3
@@ -701,7 +701,7 @@
y="444.48428"
id="text7718"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">4
@@ -710,7 +710,7 @@
y="444.48428"
id="text7722"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">5
@@ -719,7 +719,7 @@
y="444.48428"
id="text7726"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">6
@@ -728,7 +728,7 @@
y="444.48428"
id="text7730"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">7
@@ -737,7 +737,7 @@
y="444.48428"
id="text7734"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">8
@@ -746,7 +746,7 @@
y="444.48428"
id="text7738"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">...
@@ -755,7 +755,7 @@
y="444.48428"
id="text7962"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">the-cars
@@ -774,7 +774,7 @@
y="539.93878"
id="text7970"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">the-cdrs
@@ -783,7 +783,7 @@
y="492.21155"
id="text8130"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">p5
@@ -792,7 +792,7 @@
y="492.21155"
id="text8134"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">n3
@@ -801,7 +801,7 @@
y="492.21155"
id="text8138"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">n4
@@ -810,7 +810,7 @@
y="492.21155"
id="text8142"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">n1
@@ -819,7 +819,7 @@
y="492.21155"
id="text8146"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">n2
@@ -828,7 +828,7 @@
y="492.21155"
id="text8170"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">...
@@ -837,7 +837,7 @@
y="539.93878"
id="text8150"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">p2
@@ -846,7 +846,7 @@
y="539.93878"
id="text8154"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">p4
@@ -855,7 +855,7 @@
y="539.93878"
id="text8158"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">e0
@@ -864,7 +864,7 @@
y="539.93878"
id="text8162"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">p7
@@ -873,7 +873,7 @@
y="539.93878"
id="text8166"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">e0
@@ -882,7 +882,7 @@
y="539.93878"
id="text8174"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">...
@@ -897,7 +897,7 @@
x="140"
y="322.36218"
id="rect3794-7-1-0"
- style="fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.77952754;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.77952754;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.77952754;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.77952754;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.77952754;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.77952754;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.77952754;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.77952754;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.77952754;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mstart);display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
((1 2) 3 4)
@@ -1088,7 +1088,7 @@
y="359.36218"
id="text7602"
xml:space="preserve"
- style="font-size:10.477px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">1
@@ -1097,7 +1097,7 @@
y="359.36218"
id="text7606"
xml:space="preserve"
- style="font-size:10.477px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">2
@@ -1106,7 +1106,7 @@
y="359.36218"
id="text7610"
xml:space="preserve"
- style="font-size:10.477px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">4
@@ -1115,7 +1115,7 @@
y="409.36218"
id="text7614"
xml:space="preserve"
- style="font-size:10.477px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">5
@@ -1124,7 +1124,7 @@
y="409.36218"
id="text7618"
xml:space="preserve"
- style="font-size:10.477px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">7
@@ -1133,7 +1133,7 @@
y="388.89789"
id="text3007-0"
xml:space="preserve"
- style="font-size:10.477px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818827;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
the-cars
@@ -334,7 +334,7 @@
y="139.17262"
id="text9428"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">the-cdrs
@@ -343,7 +343,7 @@
y="480.8804"
id="text9424-2"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">the-cars
@@ -352,7 +352,7 @@
y="511.92728"
id="text9428-3"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">the-cdrs
@@ -361,7 +361,7 @@
y="356.78955"
id="text9424-6"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">new-cars
@@ -370,7 +370,7 @@
y="387.83643"
id="text9428-36"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">new-cdrs
@@ -379,7 +379,7 @@
y="232.69867"
id="text9424-6-3"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">new-cars
@@ -388,14 +388,14 @@
y="263.74557"
id="text9428-36-8"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono;text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">new-cdrs
diff --git a/static/img_original/Fig5.15c.std.svg.pdf b/static/img_original/Fig5.15c.std.svg.pdf
index f3396c363..1c2418255 100644
Binary files a/static/img_original/Fig5.15c.std.svg.pdf and b/static/img_original/Fig5.15c.std.svg.pdf differ
diff --git a/static/img_original/Fig5.1a.std.svg b/static/img_original/Fig5.1a.std.svg
index 28d95c78f..7b0e4d1c6 100644
--- a/static/img_original/Fig5.1a.std.svg
+++ b/static/img_original/Fig5.1a.std.svg
@@ -4,31 +4,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -69,41 +69,41 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- a
- b
- t
- rem
- a←b
- t←r
- b←t
- 0
- =
+ a
+ b
+ t
+ rem
+ a←b
+ t←r
+ b←t
+ 0
+ =
diff --git a/static/img_original/Fig5.1a.std.svg.pdf b/static/img_original/Fig5.1a.std.svg.pdf
index 088fed3d5..16da4aef3 100644
Binary files a/static/img_original/Fig5.1a.std.svg.pdf and b/static/img_original/Fig5.1a.std.svg.pdf differ
diff --git a/static/img_original/Fig5.2.std.svg b/static/img_original/Fig5.2.std.svg
index db28a3912..61e9d26c9 100644
--- a/static/img_original/Fig5.2.std.svg
+++ b/static/img_original/Fig5.2.std.svg
@@ -53,7 +53,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -168,7 +168,7 @@
start
yes
done
no
@@ -291,7 +291,7 @@
y="119.63512"
id="text6689-7-1"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:Latin Modern Mono;-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.06299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.531496;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.01468;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:0.531496;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:0.531496;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:0.531496;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.48819;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)" />
read
@@ -482,7 +482,7 @@
y="262.48129"
id="text6689-7-1"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">a
@@ -491,7 +491,7 @@
y="262.48129"
id="text6689-7-1-5"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">b
@@ -500,7 +500,7 @@
y="568.61792"
id="text6689-7-1-3"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">t
@@ -509,7 +509,7 @@
y="414.52686"
id="text6689-7-1-3-1-1"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">rem
@@ -518,7 +518,7 @@
y="288.16165"
id="text4630"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">0
@@ -557,7 +557,7 @@
y="262.52524"
id="text4171"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">=
@@ -566,7 +566,7 @@
y="414.52686"
id="text6689-7-1-3-1-3"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:Sans;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">print
@@ -575,7 +575,7 @@
y="194.61612"
id="text4630-9"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#383838;fill-opacity:1;stroke:none">P
diff --git a/static/img_original/Fig5.4c.std.svg.pdf b/static/img_original/Fig5.4c.std.svg.pdf
index 6cfb58f94..93aeefd94 100644
Binary files a/static/img_original/Fig5.4c.std.svg.pdf and b/static/img_original/Fig5.4c.std.svg.pdf differ
diff --git a/static/img_original/Fig5.5b.std.svg b/static/img_original/Fig5.5b.std.svg
index 86f3549c5..9f3459f85 100644
--- a/static/img_original/Fig5.5b.std.svg
+++ b/static/img_original/Fig5.5b.std.svg
@@ -47,7 +47,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
a←b
t←a
b←t
t←d
a
b
t
--
<
0
=
=
start
yes
done
no
<
no
yes
t←a
a←b
b←t
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -84,95 +84,95 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- gcd-1 (test (op =) (reg b) (const 0)) (branch (label after-gcd-1)) (assign t (op rem) (reg a) (reg b)) (assign a (reg b)) (assign b (reg t)) (goto (label gcd-1))after-gcd-1
+ gcd-1 (test (op =) (reg b) (const 0)) (branch (label after-gcd-1)) (assign t (op rem) (reg a) (reg b)) (assign a (reg b)) (assign b (reg t)) (goto (label gcd-1))after-gcd-1
-
- a
+
+ a
-
- b
+
+ b
-
- t
+
+ t
- rem
- a←b
- t←r
- b←t
-
-
- 0
+ rem
+ a←b
+ t←r
+ b←t
+
+
+ 0
-
- =
+
+ =
- gcd-2 (test (op =) (reg d) (const 0)) (branch (label after-gcd-2)) (assign s (op rem) (reg c) (reg d)) (assign c (reg d)) (assign d (reg s)) (goto (label gcd-2))after-gcd-2
+ gcd-2 (test (op =) (reg d) (const 0)) (branch (label after-gcd-2)) (assign s (op rem) (reg c) (reg d)) (assign c (reg d)) (assign d (reg s)) (goto (label gcd-2))after-gcd-2
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- c
+
+ c
-
- d
+
+ d
-
- s
+
+ s
- rem
- c←d
- s←r
- d←s
-
-
- 0
+ rem
+ c←d
+ s←r
+ d←s
+
+
+ 0
-
- =
+
+ =
diff --git a/static/img_original/Fig5.7b.std.svg.pdf b/static/img_original/Fig5.7b.std.svg.pdf
index 6b9b8c9cc..2a83b4d71 100644
Binary files a/static/img_original/Fig5.7b.std.svg.pdf and b/static/img_original/Fig5.7b.std.svg.pdf differ
diff --git a/static/img_original/ch1-Z-G-1.svg b/static/img_original/ch1-Z-G-1.svg
index f08b287c7..76f9cc76d 100644
--- a/static/img_original/ch1-Z-G-1.svg
+++ b/static/img_original/ch1-Z-G-1.svg
@@ -57,7 +57,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path3842"
- style="fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
@@ -139,7 +139,7 @@
y="258.79074"
id="text3025"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Courier New';-inkscape-font-specification:'Courier New';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -148,7 +148,7 @@
y="258.79074"
id="text3029"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -157,7 +157,7 @@
y="250.93361"
id="text3033"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:FreeMono;-inkscape-font-specification:FreeMono;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -166,7 +166,7 @@
y="254.50504"
id="text3037"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:FreeMono;-inkscape-font-specification:FreeMono;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -175,7 +175,7 @@
y="258.79074"
id="text3041"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -204,7 +204,7 @@
y="258.07648"
id="text3053"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;line-height:125%;font-family:LMMono12;-inkscape-font-specification:LMMono12;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -223,7 +223,7 @@
y="221.6479"
id="text3061"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:LMMono12;-inkscape-font-specification:LMMono12;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -232,42 +232,42 @@
y="396.64789"
id="text3065"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:LMMono12;-inkscape-font-specification:LMMono12;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
+ style="fill:none;stroke:#000000;stroke-width:1.06299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.06299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.06299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.06299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.06299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.06299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-mid:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.06299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1.06299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
(factorial 6)
+ style="fill:none;stroke:#000000;stroke-width:1.1905303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Lend);marker-end:url(#Arrow1Lend)" />
diff --git a/static/img_original/ch1-Z-G-10.svg.pdf b/static/img_original/ch1-Z-G-10.svg.pdf
index cd9ec3f76..a8a88daf7 100644
Binary files a/static/img_original/ch1-Z-G-10.svg.pdf and b/static/img_original/ch1-Z-G-10.svg.pdf differ
diff --git a/static/img_original/ch1-Z-G-13.svg b/static/img_original/ch1-Z-G-13.svg
index e3905b345..c0e6385a4 100644
--- a/static/img_original/ch1-Z-G-13.svg
+++ b/static/img_original/ch1-Z-G-13.svg
@@ -50,7 +50,7 @@
d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
transform="matrix(-0.8,0,0,-0.8,4.8,0)"
id="path3954"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
@@ -306,7 +306,7 @@
transform="translate(119.375,120.50487)"
id="text5042"
xml:space="preserve"
- style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">
@@ -315,7 +315,7 @@
y="-59.808353"
id="text5046"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:45.8182px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">
@@ -335,7 +335,7 @@
y="16.073187"
id="text5054"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 4
@@ -344,7 +344,7 @@
y="15.922465"
id="text5058"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 3
@@ -353,7 +353,7 @@
y="94.575264"
id="text5062"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 3
@@ -362,7 +362,7 @@
y="94.448578"
id="text5066"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 2
@@ -371,7 +371,7 @@
y="94.365906"
id="text5070"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 2
@@ -380,7 +380,7 @@
y="94.448578"
id="text5074"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 1
@@ -389,7 +389,7 @@
y="173.6662"
id="text5078"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 2
@@ -398,7 +398,7 @@
y="173.62218"
id="text5082"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 1
@@ -407,7 +407,7 @@
y="173.62218"
id="text5086"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 1
@@ -416,7 +416,7 @@
y="173.53947"
id="text5090"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 0
@@ -425,7 +425,7 @@
y="173.62218"
id="text5094"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 1
@@ -434,7 +434,7 @@
y="173.6662"
id="text5098"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 0
@@ -443,7 +443,7 @@
y="227.68558"
id="text5102"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">1
@@ -452,7 +452,7 @@
y="226.80403"
id="text5106"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">1
@@ -461,7 +461,7 @@
y="227.12074"
id="text5110"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">1
@@ -470,7 +470,7 @@
y="227.20348"
id="text5114"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">0
@@ -479,7 +479,7 @@
y="227.28615"
id="text5118"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">0
@@ -488,7 +488,7 @@
y="306.12897"
id="text5122"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">0
@@ -497,7 +497,7 @@
y="306.29437"
id="text5126"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">1
@@ -506,7 +506,7 @@
y="252.75708"
id="text5130"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 1
@@ -515,7 +515,7 @@
y="252.7131"
id="text5134"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">fib 0
@@ -524,7 +524,7 @@
y="148.74535"
id="text5110-3"
xml:space="preserve"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Latin Modern Mono;-inkscape-font-specification:Latin Modern Mono">1
@@ -536,111 +536,111 @@
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86456692;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.86585552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:0.94250661;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.94250668, 2.82752002;stroke-dashoffset:0;display:inline" />
diff --git a/static/img_original/ch1-Z-G-13.svg.pdf b/static/img_original/ch1-Z-G-13.svg.pdf
index 61bc765f9..78b4ef819 100644
Binary files a/static/img_original/ch1-Z-G-13.svg.pdf and b/static/img_original/ch1-Z-G-13.svg.pdf differ
diff --git a/static/img_original/ch1-Z-G-6.svg b/static/img_original/ch1-Z-G-6.svg
index d84b30dc1..f77f1bd1c 100644
--- a/static/img_original/ch1-Z-G-6.svg
+++ b/static/img_original/ch1-Z-G-6.svg
@@ -15,18 +15,18 @@
-->
- square
- /
- good-enough
- \
- abs
- average
- \
- improve
- /
- \
- sqrt-iter
- |
- sqrt
+ square
+ /
+ good-enough
+ \
+ abs
+ average
+ \
+ improve
+ /
+ \
+ sqrt-iter
+ |
+ sqrt
diff --git a/static/img_original/ch1-Z-G-6.svg.pdf b/static/img_original/ch1-Z-G-6.svg.pdf
index bcb4e8621..7003758dd 100644
Binary files a/static/img_original/ch1-Z-G-6.svg.pdf and b/static/img_original/ch1-Z-G-6.svg.pdf differ
diff --git a/static/img_original/ch1-Z-G-7.svg b/static/img_original/ch1-Z-G-7.svg
index e6179934c..14d722da0 100644
--- a/static/img_original/ch1-Z-G-7.svg
+++ b/static/img_original/ch1-Z-G-7.svg
@@ -6,26 +6,26 @@
SICP Figure 1.3
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
@@ -72,7 +72,7 @@
-->
- (factorial 6)(* 6 (factorial 5))(* 6 (* 5 (factorial 4)))(* 6 (* 5 (* 4 (factorial 3))))(* 6 (* 5 (* 4 (* 3 (factorial 2)))))(* 6 (* 5 (* 4 (* 3 (* 2 (factorial 1))))))(* 6 (* 5 (* 4 (* 3 (* 2 1)))))(* 6 (* 5 (* 4 (* 3 2))))(* 6 (* 5 (* 4 6)))(* 6 (* 5 24))(* 6 120)720
+ (factorial 6)(* 6 (factorial 5))(* 6 (* 5 (factorial 4)))(* 6 (* 5 (* 4 (factorial 3))))(* 6 (* 5 (* 4 (* 3 (factorial 2)))))(* 6 (* 5 (* 4 (* 3 (* 2 (factorial 1))))))(* 6 (* 5 (* 4 (* 3 (* 2 1)))))(* 6 (* 5 (* 4 (* 3 2))))(* 6 (* 5 (* 4 6)))(* 6 (* 5 24))(* 6 120)720
-
+
diff --git a/static/img_original/ch1-Z-G-7.svg.pdf b/static/img_original/ch1-Z-G-7.svg.pdf
index ea2b231ab..f1788e24c 100644
Binary files a/static/img_original/ch1-Z-G-7.svg.pdf and b/static/img_original/ch1-Z-G-7.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-11.svg b/static/img_original/ch2-Z-G-11.svg
index 3be519a21..a1780f4c8 100644
--- a/static/img_original/ch2-Z-G-11.svg
+++ b/static/img_original/ch2-Z-G-11.svg
@@ -51,7 +51,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(0.4,0,0,0.4,4,0)"
id="path4565"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.811737;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:none;stroke:#000000;stroke-width:0.811737;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#000000;stroke:#000000;stroke-width:1.48818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Mstart)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Mstart)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Mstart)" />
+ style="display:inline;fill:none;stroke:#000000;stroke-width:0.811737;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:none;stroke:#000000;stroke-width:0.811737;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
SICP Figure 2.3
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -117,65 +117,65 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 1
- 4
-
-
- 2
- 3
-
-
-
-
- 3
- 4
- 1
- 2
- (cons (cons 1 2) (cons 3 4))
- (cons (cons 1 (cons 2 3)) 4)
+
+
+
+
+ 1
+ 4
+
+
+ 2
+ 3
+
+
+
+
+ 3
+ 4
+ 1
+ 2
+ (cons (cons 1 2) (cons 3 4))
+ (cons (cons 1 (cons 2 3)) 4)
diff --git a/static/img_original/ch2-Z-G-12.svg.pdf b/static/img_original/ch2-Z-G-12.svg.pdf
index 836b4bc09..360073a96 100644
Binary files a/static/img_original/ch2-Z-G-12.svg.pdf and b/static/img_original/ch2-Z-G-12.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-13.svg b/static/img_original/ch2-Z-G-13.svg
index 0e3e95469..3018a2e46 100644
--- a/static/img_original/ch2-Z-G-13.svg
+++ b/static/img_original/ch2-Z-G-13.svg
@@ -5,82 +5,82 @@
SICP Figure 2.1
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -124,41 +124,41 @@
-->
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 1
- 4
- 2
- 3
+
+
+
+
+ 1
+ 4
+ 2
+ 3
diff --git a/static/img_original/ch2-Z-G-13.svg.pdf b/static/img_original/ch2-Z-G-13.svg.pdf
index 5d03b3cae..74aaff350 100644
Binary files a/static/img_original/ch2-Z-G-13.svg.pdf and b/static/img_original/ch2-Z-G-13.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-15.svg b/static/img_original/ch2-Z-G-15.svg
index e608c8b4e..8b7bdb10c 100644
--- a/static/img_original/ch2-Z-G-15.svg
+++ b/static/img_original/ch2-Z-G-15.svg
@@ -4,100 +4,100 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -144,51 +144,51 @@
-->
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- (1 2)
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (1 2)
+
+
+
+
+
- 4
- 1
- 2
- 3
-
-
-
-
-
- (3 4)
- ((1 2) 3 4)
-
+ 4
+ 1
+ 2
+ 3
+
+
+
+
+
+ (3 4)
+ ((1 2) 3 4)
+
diff --git a/static/img_original/ch2-Z-G-15.svg.pdf b/static/img_original/ch2-Z-G-15.svg.pdf
index 40e247dda..18d403741 100644
Binary files a/static/img_original/ch2-Z-G-15.svg.pdf and b/static/img_original/ch2-Z-G-15.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-16.svg b/static/img_original/ch2-Z-G-16.svg
index 81f037ef5..6fdc487ce 100644
--- a/static/img_original/ch2-Z-G-16.svg
+++ b/static/img_original/ch2-Z-G-16.svg
@@ -103,7 +103,7 @@
y="283.07648"
id="text3021"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -112,7 +112,7 @@
y="258.79074"
id="text3025"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Courier New';-inkscape-font-specification:'Courier New';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -121,7 +121,7 @@
y="258.79074"
id="text3029"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -130,7 +130,7 @@
y="250.93361"
id="text3033"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:FreeMono;-inkscape-font-specification:FreeMono;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -139,7 +139,7 @@
y="254.50504"
id="text3037"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:FreeMono;-inkscape-font-specification:FreeMono;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -148,7 +148,7 @@
y="258.79074"
id="text3041"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono';letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -177,7 +177,7 @@
y="258.07648"
id="text3053"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;line-height:125%;font-family:LMMono12;-inkscape-font-specification:LMMono12;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -196,7 +196,7 @@
y="221.6479"
id="text3061"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:LMMono12;-inkscape-font-specification:LMMono12;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
@@ -205,32 +205,32 @@
y="396.64789"
id="text3065"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:LMMono12;-inkscape-font-specification:LMMono12;letter-spacing:0px;word-spacing:0px;fill:#383838;fill-opacity:1;stroke:none">
+ style="display:inline;fill:none;stroke:#000000;stroke-width:0.811739;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="display:inline;fill:none;stroke:#000000;stroke-width:0.811739;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="display:inline;fill:none;stroke:#000000;stroke-width:0.811739;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
((1 2) 3 4)
@@ -250,7 +250,7 @@
y="494.17041"
id="text5689"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;display:inline;fill:#383838;fill-opacity:1;stroke:none">(1 2)
@@ -259,7 +259,7 @@
y="528.53406"
id="text5673"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">3
@@ -268,7 +268,7 @@
y="528.53406"
id="text5677"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">4
@@ -277,7 +277,7 @@
y="595.35217"
id="text5681"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">1
@@ -286,7 +286,7 @@
y="595.35217"
id="text5685"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#383838;fill-opacity:1;stroke:none">2
diff --git a/static/img_original/ch2-Z-G-16.svg.pdf b/static/img_original/ch2-Z-G-16.svg.pdf
index 0f5056d2a..59f4b8d52 100644
Binary files a/static/img_original/ch2-Z-G-16.svg.pdf and b/static/img_original/ch2-Z-G-16.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-17.svg b/static/img_original/ch2-Z-G-17.svg
index 458fec966..3e69bf6ef 100644
--- a/static/img_original/ch2-Z-G-17.svg
+++ b/static/img_original/ch2-Z-G-17.svg
@@ -5,25 +5,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -73,27 +73,27 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- enumerate:tree leaves
- filter:odd?
- map:square
- accumulate:+, 0
- enumerate:integers
- map:fib
- filter:even?
- accumulate:cons, ()
+ enumerate:tree leaves
+ filter:odd?
+ map:square
+ accumulate:+, 0
+ enumerate:integers
+ map:fib
+ filter:even?
+ accumulate:cons, ()
diff --git a/static/img_original/ch2-Z-G-17.svg.pdf b/static/img_original/ch2-Z-G-17.svg.pdf
index e389bce4b..1e5287afc 100644
Binary files a/static/img_original/ch2-Z-G-17.svg.pdf and b/static/img_original/ch2-Z-G-17.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-23.svg.pdf b/static/img_original/ch2-Z-G-23.svg.pdf
index 3d5287a4f..d639f48d6 100644
Binary files a/static/img_original/ch2-Z-G-23.svg.pdf and b/static/img_original/ch2-Z-G-23.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-37.svg b/static/img_original/ch2-Z-G-37.svg
index a7dca6eb4..9a3600a22 100644
--- a/static/img_original/ch2-Z-G-37.svg
+++ b/static/img_original/ch2-Z-G-37.svg
@@ -39,36 +39,36 @@
-->
-
-
-
+
+
+
- right-split
- identity
- right-split
- right-split n
+ right-split
+ identity
+ right-split
+ right-split n
-
-
-
-
-
-
- right-split
- corner-split
- up-split
- n--1
- up-split
- right-split
- identity
- n--1
- n--1
- n--1
- n--1
+
+
+
+
+
+
+ right-split
+ corner-split
+ up-split
+ n--1
+ up-split
+ right-split
+ identity
+ n--1
+ n--1
+ n--1
+ n--1
- corner-split n
- n--1
- n--1
+ corner-split n
+ n--1
+ n--1
diff --git a/static/img_original/ch2-Z-G-37.svg.pdf b/static/img_original/ch2-Z-G-37.svg.pdf
index 81017fb82..2eea9a95e 100644
Binary files a/static/img_original/ch2-Z-G-37.svg.pdf and b/static/img_original/ch2-Z-G-37.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-42.svg b/static/img_original/ch2-Z-G-42.svg
index 2a1835467..0eb6ea774 100644
--- a/static/img_original/ch2-Z-G-42.svg
+++ b/static/img_original/ch2-Z-G-42.svg
@@ -17,7 +17,7 @@
sodipodi:docname="ch2-Z-G-42.svg"
width="303.23355"
height="292.8714"
- inkscape:version="0.92.3 (2405546, 2018-03-11)">
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
@@ -204,10 +204,15 @@
image/svg+xml
-
+
-
+
+
frameFrameedge1Edgevector
+ y="286.83469">vector
frameFrameedge2Edgevector
+ y="296.38013">vector
frameoriginvector
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81833299px;line-height:125%;font-family:Times;-inkscape-font-specification:'Times, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">FrameOriginvector
(0, 0) point on
+ 2
+ 1
diff --git a/static/img_original/ch2-Z-G-42.svg.pdf b/static/img_original/ch2-Z-G-42.svg.pdf
index a6864feee..68254b647 100644
Binary files a/static/img_original/ch2-Z-G-42.svg.pdf and b/static/img_original/ch2-Z-G-42.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-51.svg b/static/img_original/ch2-Z-G-51.svg
index d0670e805..f4b2e26ef 100644
--- a/static/img_original/ch2-Z-G-51.svg
+++ b/static/img_original/ch2-Z-G-51.svg
@@ -42,40 +42,40 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 7
- 3
- 5
- 3
- 9
- 1
- 7
- 9
- 3
- 1
- 11
- 5
- 9
- 1
- 7
- 11
- 11
- 5
+ 7
+ 3
+ 5
+ 3
+ 9
+ 1
+ 7
+ 9
+ 3
+ 1
+ 11
+ 5
+ 9
+ 1
+ 7
+ 11
+ 11
+ 5
diff --git a/static/img_original/ch2-Z-G-51.svg.pdf b/static/img_original/ch2-Z-G-51.svg.pdf
index 3afc6b654..85051d07f 100644
Binary files a/static/img_original/ch2-Z-G-51.svg.pdf and b/static/img_original/ch2-Z-G-51.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-52.svg b/static/img_original/ch2-Z-G-52.svg
index f89fdc596..ef02eea50 100644
--- a/static/img_original/ch2-Z-G-52.svg
+++ b/static/img_original/ch2-Z-G-52.svg
@@ -38,20 +38,20 @@
-->
-
-
-
-
-
-
+
+
+
+
+
+
- 1
- 2
- 3
- 4
- 5
- 6
- 7
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
diff --git a/static/img_original/ch2-Z-G-52.svg.pdf b/static/img_original/ch2-Z-G-52.svg.pdf
index 5461b0bcf..808245574 100644
Binary files a/static/img_original/ch2-Z-G-52.svg.pdf and b/static/img_original/ch2-Z-G-52.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-53.svg b/static/img_original/ch2-Z-G-53.svg
index 1edb64aa8..f44f9620b 100644
--- a/static/img_original/ch2-Z-G-53.svg
+++ b/static/img_original/ch2-Z-G-53.svg
@@ -40,43 +40,43 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {A B C D E F G H} 17
- {B C D E F G H} 9
- A 8
- {B C D} 5
- {C D} 2
- D 1
- C 1
- B 3
- {E F G H} 4
- {G H} 2
- {E F} 2
- E 1
- F 1
- H 1
- G 1
+ {A B C D E F G H} 17
+ {B C D E F G H} 9
+ A 8
+ {B C D} 5
+ {C D} 2
+ D 1
+ C 1
+ B 3
+ {E F G H} 4
+ {G H} 2
+ {E F} 2
+ E 1
+ F 1
+ H 1
+ G 1
diff --git a/static/img_original/ch2-Z-G-53.svg.pdf b/static/img_original/ch2-Z-G-53.svg.pdf
index 7626da266..b95dba4ae 100644
Binary files a/static/img_original/ch2-Z-G-53.svg.pdf and b/static/img_original/ch2-Z-G-53.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-54.svg b/static/img_original/ch2-Z-G-54.svg
index f51fbcafd..6a43a4a46 100644
--- a/static/img_original/ch2-Z-G-54.svg
+++ b/static/img_original/ch2-Z-G-54.svg
@@ -51,22 +51,22 @@
-->
-
-
-
-
-
-
+
+
+
+
+
+
- add-complex
- Programs that use complex numbers
- Complex-arithmetic package
- Rectangularrepresentation
- Polarrepresentation
- List structure and primitive machine arithmetic
- sub-complex
- mul-complex
- div-complex
+ add-complex
+ Programs that use complex numbers
+ Complex-arithmetic package
+ Rectangularrepresentation
+ Polarrepresentation
+ List structure and primitive machine arithmetic
+ sub-complex
+ mul-complex
+ div-complex
diff --git a/static/img_original/ch2-Z-G-54.svg.pdf b/static/img_original/ch2-Z-G-54.svg.pdf
index 71481a3c0..bedba893e 100644
Binary files a/static/img_original/ch2-Z-G-54.svg.pdf and b/static/img_original/ch2-Z-G-54.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-59.svg b/static/img_original/ch2-Z-G-59.svg
index 3b5074293..c9c563d6d 100644
--- a/static/img_original/ch2-Z-G-59.svg
+++ b/static/img_original/ch2-Z-G-59.svg
@@ -1,26 +1,107 @@
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Imaginary
- Real
- z = x + iy = re
- A
- y
- x
- r
- iA
+
+ Imaginary
+ Real
+ z = x + iy = re
+ A
+ y
+ x
+ r
+ iA
diff --git a/static/img_original/ch2-Z-G-59.svg.pdf b/static/img_original/ch2-Z-G-59.svg.pdf
index 3e9d3fc8e..27e091de6 100644
Binary files a/static/img_original/ch2-Z-G-59.svg.pdf and b/static/img_original/ch2-Z-G-59.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-6.svg b/static/img_original/ch2-Z-G-6.svg
index 549c5f9ce..80190d846 100644
--- a/static/img_original/ch2-Z-G-6.svg
+++ b/static/img_original/ch2-Z-G-6.svg
@@ -119,7 +119,7 @@
x="123.37505"
y="79.130798"
id="rect4103"
- style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:0.81173867;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173867;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173867;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173867;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:0.81173867;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
Rational numbers in problem domain
@@ -176,7 +176,7 @@
y="224.22156"
id="text6876"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.8181572px;line-height:125%;font-family:'Times';-inkscape-font-specification:'Times';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">Rational numbers as numerators and denominators
@@ -195,7 +195,7 @@
y="338.76691"
id="text6884"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.8181572px;line-height:125%;font-family:'Times';-inkscape-font-specification:'Times';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">Rational numbers as pairs
@@ -214,7 +214,7 @@
y="453.31226"
id="text6892"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.8181572px;line-height:125%;font-family:'Times';-inkscape-font-specification:'Times';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">However pairs are implemented
@@ -236,42 +236,42 @@
diff --git a/static/img_original/ch2-Z-G-6.svg.pdf b/static/img_original/ch2-Z-G-6.svg.pdf
index c6b33d119..714debe1d 100644
Binary files a/static/img_original/ch2-Z-G-6.svg.pdf and b/static/img_original/ch2-Z-G-6.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-62.svg b/static/img_original/ch2-Z-G-62.svg
index 86c4e290b..d3c55b8e8 100644
--- a/static/img_original/ch2-Z-G-62.svg
+++ b/static/img_original/ch2-Z-G-62.svg
@@ -46,25 +46,25 @@
-->
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- add-complex sub-complex mul-complex div-complex
- Programs that use complex numbers
- Complex-arithmetic package
- Rectangularrepresentation
- Polarrepresentation
- List structure and primitive machine arithmetic
+ add-complex sub-complex mul-complex div-complex
+ Programs that use complex numbers
+ Complex-arithmetic package
+ Rectangularrepresentation
+ Polarrepresentation
+ List structure and primitive machine arithmetic
- real-part
- imag-part
- magnitude
- angle
+ real-part
+ imag-part
+ magnitude
+ angle
diff --git a/static/img_original/ch2-Z-G-62.svg.pdf b/static/img_original/ch2-Z-G-62.svg.pdf
index 21dfa3823..78f7e8680 100644
Binary files a/static/img_original/ch2-Z-G-62.svg.pdf and b/static/img_original/ch2-Z-G-62.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-63.svg b/static/img_original/ch2-Z-G-63.svg
index bac160d3b..c040e413f 100644
--- a/static/img_original/ch2-Z-G-63.svg
+++ b/static/img_original/ch2-Z-G-63.svg
@@ -100,11 +100,11 @@
+ style="fill:none;stroke:#000000;stroke-width:1.01467252;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
@@ -116,7 +116,7 @@
id="g874"
transform="matrix(1.1214098,0,0,1.1214098,-19.372682,-37.819252)">
real-part
imag-part
magnitude
angle
real-part-polar
imag-part-polar
magnitude-polar
angle-polar
real-part-rectangular
imag-part-rectangular
magnitude-rectangular
Types
@@ -238,7 +238,7 @@
y="56.211823"
id="text4527"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81814003px;line-height:125%;font-family:Times;-inkscape-font-specification:Times;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">Polar
@@ -247,7 +247,7 @@
y="56.211823"
id="text4531"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81814003px;line-height:125%;font-family:Times;-inkscape-font-specification:Times;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">Rectangular
@@ -256,7 +256,7 @@
y="56.211823"
id="text4535"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.81814003px;line-height:125%;font-family:Times;-inkscape-font-specification:Times;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#383838;fill-opacity:1;stroke:none">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- add sub mul div
+ add sub mul div
- add-complex
- mul-complex
- sub-complex
- div-complex
+ add-complex
+ mul-complex
+ sub-complex
+ div-complex
- Programs that use numbers
- Generic arithmetic package
- Complex arithmetic
- Rectangular
- Polar
+ Programs that use numbers
+ Generic arithmetic package
+ Complex arithmetic
+ Rectangular
+ Polar
- sub-rat
- div-rat
- add-rat
- mul-rat
+ sub-rat
+ div-rat
+ add-rat
+ mul-rat
- Rationalarithmetic
- Ordinaryarithmetic
- List structure and primitive machine arithmetic
- + -- * /
+ Rationalarithmetic
+ Ordinaryarithmetic
+ List structure and primitive machine arithmetic
+ + -- * /
diff --git a/static/img_original/ch2-Z-G-64.svg.pdf b/static/img_original/ch2-Z-G-64.svg.pdf
index b7bdb03ae..24ab395c9 100644
Binary files a/static/img_original/ch2-Z-G-64.svg.pdf and b/static/img_original/ch2-Z-G-64.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-65.svg b/static/img_original/ch2-Z-G-65.svg
index 2838f3cf2..8795a078c 100644
--- a/static/img_original/ch2-Z-G-65.svg
+++ b/static/img_original/ch2-Z-G-65.svg
@@ -5,34 +5,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -74,34 +74,34 @@
-->
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 3
- 4
- complex
- rectangular
+ 3
+ 4
+ complex
+ rectangular
diff --git a/static/img_original/ch2-Z-G-65.svg.pdf b/static/img_original/ch2-Z-G-65.svg.pdf
index 9920e37ef..7807ecc58 100644
Binary files a/static/img_original/ch2-Z-G-65.svg.pdf and b/static/img_original/ch2-Z-G-65.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-66.svg b/static/img_original/ch2-Z-G-66.svg
index 49ecc0571..f406bdac8 100644
--- a/static/img_original/ch2-Z-G-66.svg
+++ b/static/img_original/ch2-Z-G-66.svg
@@ -4,13 +4,13 @@
-
+
-
+
-
+
@@ -54,14 +54,14 @@
-->
-
-
-
+
+
+
- complex
- real
- rational
- integer
+ complex
+ real
+ rational
+ integer
diff --git a/static/img_original/ch2-Z-G-66.svg.pdf b/static/img_original/ch2-Z-G-66.svg.pdf
index 5a4667ad8..d63c4d3d8 100644
Binary files a/static/img_original/ch2-Z-G-66.svg.pdf and b/static/img_original/ch2-Z-G-66.svg.pdf differ
diff --git a/static/img_original/ch2-Z-G-67.svg b/static/img_original/ch2-Z-G-67.svg
index c32c17190..64ceaf91f 100644
--- a/static/img_original/ch2-Z-G-67.svg
+++ b/static/img_original/ch2-Z-G-67.svg
@@ -40,35 +40,35 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- polygon
- quadrilateral
- kite
- trapezoid
- parallelogram
- rectangle
- rhombus
- square
- triangle
- isoscelestriangle
- right triangle
- isoscelesright triangle
- equilateraltriangle
+ polygon
+ quadrilateral
+ kite
+ trapezoid
+ parallelogram
+ rectangle
+ rhombus
+ square
+ triangle
+ isoscelestriangle
+ right triangle
+ isoscelesright triangle
+ equilateraltriangle
diff --git a/static/img_original/ch2-Z-G-67.svg.pdf b/static/img_original/ch2-Z-G-67.svg.pdf
index f38ec3170..478dbd8b2 100644
Binary files a/static/img_original/ch2-Z-G-67.svg.pdf and b/static/img_original/ch2-Z-G-67.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-10.svg b/static/img_original/ch3-Z-G-10.svg
index ee9b92196..451fc4d26 100644
--- a/static/img_original/ch3-Z-G-10.svg
+++ b/static/img_original/ch3-Z-G-10.svg
@@ -4,34 +4,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -68,25 +68,25 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- E1
- make-withdraw: ...
- W1:
- globalenv
- balance: 50
- parameters: amountbody: ...
+ E1
+ make-withdraw: ...
+ W1:
+ globalenv
+ balance: 50
+ parameters: amountbody: ...
diff --git a/static/img_original/ch3-Z-G-10.svg.pdf b/static/img_original/ch3-Z-G-10.svg.pdf
index 37d649be8..b50336246 100644
Binary files a/static/img_original/ch3-Z-G-10.svg.pdf and b/static/img_original/ch3-Z-G-10.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-11.svg b/static/img_original/ch3-Z-G-11.svg
index 4790776c4..d782488a7 100644
--- a/static/img_original/ch3-Z-G-11.svg
+++ b/static/img_original/ch3-Z-G-11.svg
@@ -4,49 +4,49 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -83,38 +83,38 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- E1
- W2:
- W1:
- globalenv
- balance: 50
- parameters: amountbody: ...
-
- E2
- balance: 100
- make-withdraw: ...
+ E1
+ W2:
+ W1:
+ globalenv
+ balance: 50
+ parameters: amountbody: ...
+
+ E2
+ balance: 100
+ make-withdraw: ...
diff --git a/static/img_original/ch3-Z-G-11.svg.pdf b/static/img_original/ch3-Z-G-11.svg.pdf
index 84c8eb7d4..bd5e6bf11 100644
Binary files a/static/img_original/ch3-Z-G-11.svg.pdf and b/static/img_original/ch3-Z-G-11.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-12.svg b/static/img_original/ch3-Z-G-12.svg
index 0192a1c85..bc92437d6 100644
--- a/static/img_original/ch3-Z-G-12.svg
+++ b/static/img_original/ch3-Z-G-12.svg
@@ -4,58 +4,58 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -93,52 +93,52 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- parameters: xbody:(define good-enough? ...)(define improve ...)(define sqrt-iter ...)(sqrt-iter 1.0)
-
- globalenv
- sqrt:
-
- E1
- x:2
- good-enough?:
- improve: ...
- sqrt-iter: ...
- parameters: guessbody: (< (abs ...) ...)
- guess: 1
- guess: 1
- call to sqrt-iter
+ parameters: xbody:(define good-enough? ...)(define improve ...)(define sqrt-iter ...)(sqrt-iter 1.0)
+
+ globalenv
+ sqrt:
+
+ E1
+ x:2
+ good-enough?:
+ improve: ...
+ sqrt-iter: ...
+ parameters: guessbody: (< (abs ...) ...)
+ guess: 1
+ guess: 1
+ call to sqrt-iter
-
- E2
+
+ E2
- call to good-enough?
+ call to good-enough?
-
- E3
+
+ E3
diff --git a/static/img_original/ch3-Z-G-12.svg.pdf b/static/img_original/ch3-Z-G-12.svg.pdf
index 3770f8556..bf4a87bf9 100644
Binary files a/static/img_original/ch3-Z-G-12.svg.pdf and b/static/img_original/ch3-Z-G-12.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-13.svg b/static/img_original/ch3-Z-G-13.svg
index 2db6d410e..93dfe722e 100644
--- a/static/img_original/ch3-Z-G-13.svg
+++ b/static/img_original/ch3-Z-G-13.svg
@@ -4,67 +4,67 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -102,64 +102,64 @@
-->
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- c
- d
- y
- x
- e
- f
- a
- b
+ c
+ d
+ y
+ x
+ e
+ f
+ a
+ b
-
+
diff --git a/static/img_original/ch3-Z-G-13.svg.pdf b/static/img_original/ch3-Z-G-13.svg.pdf
index 8003c9f05..a26049765 100644
Binary files a/static/img_original/ch3-Z-G-13.svg.pdf and b/static/img_original/ch3-Z-G-13.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-14.svg b/static/img_original/ch3-Z-G-14.svg
index cf53fd359..ddcabfc28 100644
--- a/static/img_original/ch3-Z-G-14.svg
+++ b/static/img_original/ch3-Z-G-14.svg
@@ -4,67 +4,67 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -102,65 +102,65 @@
-->
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- c
- d
- y
- x
- e
- f
- a
- b
-
+ c
+ d
+ y
+ x
+ e
+ f
+ a
+ b
+
-
+
diff --git a/static/img_original/ch3-Z-G-14.svg.pdf b/static/img_original/ch3-Z-G-14.svg.pdf
index 4950d0e20..19a9b5e00 100644
Binary files a/static/img_original/ch3-Z-G-14.svg.pdf and b/static/img_original/ch3-Z-G-14.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-15.svg b/static/img_original/ch3-Z-G-15.svg
index 807efd843..7fb758b58 100644
--- a/static/img_original/ch3-Z-G-15.svg
+++ b/static/img_original/ch3-Z-G-15.svg
@@ -4,76 +4,76 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -111,72 +111,72 @@
-->
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- c
- d
- y
- x
- e
- f
- a
- b
-
-
-
-
-
-
- z
+ c
+ d
+ y
+ x
+ e
+ f
+ a
+ b
+
+
+
+
+
+
+ z
-
+
diff --git a/static/img_original/ch3-Z-G-15.svg.pdf b/static/img_original/ch3-Z-G-15.svg.pdf
index 996b85e73..332069e2c 100644
Binary files a/static/img_original/ch3-Z-G-15.svg.pdf and b/static/img_original/ch3-Z-G-15.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-16.svg b/static/img_original/ch3-Z-G-16.svg
index 097e744d4..aa12a02ec 100644
--- a/static/img_original/ch3-Z-G-16.svg
+++ b/static/img_original/ch3-Z-G-16.svg
@@ -4,76 +4,76 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -111,64 +111,64 @@
-->
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- c
- d
- y
- x
- e
- f
- a
- b
+ c
+ d
+ y
+ x
+ e
+ f
+ a
+ b
-
+
diff --git a/static/img_original/ch3-Z-G-16.svg.pdf b/static/img_original/ch3-Z-G-16.svg.pdf
index 8a1b02c17..f9fe2320b 100644
Binary files a/static/img_original/ch3-Z-G-16.svg.pdf and b/static/img_original/ch3-Z-G-16.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-17.svg b/static/img_original/ch3-Z-G-17.svg
index c3c363546..9b4f4e3c2 100644
--- a/static/img_original/ch3-Z-G-17.svg
+++ b/static/img_original/ch3-Z-G-17.svg
@@ -4,28 +4,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -63,34 +63,34 @@
-->
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- z1
- x
- a
- b
+ z1
+ x
+ a
+ b
diff --git a/static/img_original/ch3-Z-G-17.svg.pdf b/static/img_original/ch3-Z-G-17.svg.pdf
index 5032f5c28..6c1e24a9b 100644
Binary files a/static/img_original/ch3-Z-G-17.svg.pdf and b/static/img_original/ch3-Z-G-17.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-18.svg b/static/img_original/ch3-Z-G-18.svg
index ac694db16..bca74fd58 100644
--- a/static/img_original/ch3-Z-G-18.svg
+++ b/static/img_original/ch3-Z-G-18.svg
@@ -4,43 +4,43 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -78,43 +78,43 @@
-->
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- a
- b
- z2
+ a
+ b
+ z2
diff --git a/static/img_original/ch3-Z-G-18.svg.pdf b/static/img_original/ch3-Z-G-18.svg.pdf
index b58c1f6c7..5adcd33ff 100644
Binary files a/static/img_original/ch3-Z-G-18.svg.pdf and b/static/img_original/ch3-Z-G-18.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-19.svg b/static/img_original/ch3-Z-G-19.svg
index b7d695407..9849d9918 100644
--- a/static/img_original/ch3-Z-G-19.svg
+++ b/static/img_original/ch3-Z-G-19.svg
@@ -4,28 +4,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -65,42 +65,42 @@
-->
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- c
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ c
+
+
+
+
+
+
+
+
+
+
+
+
- front-ptr
- q
- a
- b
- rear-ptr
+ front-ptr
+ q
+ a
+ b
+ rear-ptr
diff --git a/static/img_original/ch3-Z-G-19.svg.pdf b/static/img_original/ch3-Z-G-19.svg.pdf
index 280ea71d5..187aaa288 100644
Binary files a/static/img_original/ch3-Z-G-19.svg.pdf and b/static/img_original/ch3-Z-G-19.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-2.svg b/static/img_original/ch3-Z-G-2.svg
index 36dca65d1..20545b8cf 100644
--- a/static/img_original/ch3-Z-G-2.svg
+++ b/static/img_original/ch3-Z-G-2.svg
@@ -4,16 +4,16 @@
-
+
-
+
-
+
-
+
@@ -53,28 +53,28 @@
-->
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- A
- B
- C
-
- D
- I
- II
- III
- z:6
- x:7
- m:1
- y:2
- x:3
- y:5
+ A
+ B
+ C
+
+ D
+ I
+ II
+ III
+ z:6
+ x:7
+ m:1
+ y:2
+ x:3
+ y:5
diff --git a/static/img_original/ch3-Z-G-2.svg.pdf b/static/img_original/ch3-Z-G-2.svg.pdf
index d09bf08de..7a28c1613 100644
Binary files a/static/img_original/ch3-Z-G-2.svg.pdf and b/static/img_original/ch3-Z-G-2.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-20.svg b/static/img_original/ch3-Z-G-20.svg
index 9fee8a83a..3c043fc79 100644
--- a/static/img_original/ch3-Z-G-20.svg
+++ b/static/img_original/ch3-Z-G-20.svg
@@ -5,34 +5,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -71,49 +71,49 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- front-ptr
- q
- a
- b
- rear-ptr
-
-
-
-
-
-
- c
- d
+ front-ptr
+ q
+ a
+ b
+ rear-ptr
+
+
+
+
+
+
+ c
+ d
diff --git a/static/img_original/ch3-Z-G-20.svg.pdf b/static/img_original/ch3-Z-G-20.svg.pdf
index 221056971..d0764da50 100644
Binary files a/static/img_original/ch3-Z-G-20.svg.pdf and b/static/img_original/ch3-Z-G-20.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-21.svg b/static/img_original/ch3-Z-G-21.svg
index 8d89c2acb..e04e0800a 100644
--- a/static/img_original/ch3-Z-G-21.svg
+++ b/static/img_original/ch3-Z-G-21.svg
@@ -5,34 +5,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -71,49 +71,49 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- front-ptr
- q
- a
- b
- rear-ptr
-
-
-
-
-
- c
- d
+ front-ptr
+ q
+ a
+ b
+ rear-ptr
+
+
+
+
+
+ c
+ d
diff --git a/static/img_original/ch3-Z-G-21.svg.pdf b/static/img_original/ch3-Z-G-21.svg.pdf
index 4df743d10..ba4cb9bd0 100644
Binary files a/static/img_original/ch3-Z-G-21.svg.pdf and b/static/img_original/ch3-Z-G-21.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-22.svg b/static/img_original/ch3-Z-G-22.svg
index 690ad06d8..5d1b73992 100644
--- a/static/img_original/ch3-Z-G-22.svg
+++ b/static/img_original/ch3-Z-G-22.svg
@@ -4,64 +4,64 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -100,66 +100,66 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- a
- b
- c
- 1
- 2
- 3
- *table*
- table
+ a
+ b
+ c
+ 1
+ 2
+ 3
+ *table*
+ table
diff --git a/static/img_original/ch3-Z-G-22.svg.pdf b/static/img_original/ch3-Z-G-22.svg.pdf
index 939535ee8..e204843c4 100644
Binary files a/static/img_original/ch3-Z-G-22.svg.pdf and b/static/img_original/ch3-Z-G-22.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-23.svg b/static/img_original/ch3-Z-G-23.svg
index 0ea5486bb..502215281 100644
--- a/static/img_original/ch3-Z-G-23.svg
+++ b/static/img_original/ch3-Z-G-23.svg
@@ -4,106 +4,106 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -142,124 +142,124 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- +
- -
- *
- 43
- 45
- 42
- *table*
- a
- b
- 97
- 98
- letters
- math
- table
+ +
+ -
+ *
+ 43
+ 45
+ 42
+ *table*
+ a
+ b
+ 97
+ 98
+ letters
+ math
+ table
diff --git a/static/img_original/ch3-Z-G-23.svg.pdf b/static/img_original/ch3-Z-G-23.svg.pdf
index c82cf6107..5c9bb5f1a 100644
Binary files a/static/img_original/ch3-Z-G-23.svg.pdf and b/static/img_original/ch3-Z-G-23.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-24.svg b/static/img_original/ch3-Z-G-24.svg
index 4ae7a7206..f76e64b30 100644
--- a/static/img_original/ch3-Z-G-24.svg
+++ b/static/img_original/ch3-Z-G-24.svg
@@ -32,7 +32,7 @@
id="namedview27"
showgrid="false"
inkscape:zoom="3.8835146"
- inkscape:cx="262.19903"
+ inkscape:cx="205.16307"
inkscape:cy="-20.644803"
inkscape:window-x="0"
inkscape:window-y="0"
@@ -89,7 +89,7 @@
image/svg+xml
-
+
@@ -100,63 +100,63 @@
Inverter
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.00000025px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">Inverter
And-gate
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">And-gate
Or-gate
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">Or-gate
diff --git a/static/img_original/ch3-Z-G-24.svg.pdf b/static/img_original/ch3-Z-G-24.svg.pdf
index 3f3fd91f7..3646030b6 100644
Binary files a/static/img_original/ch3-Z-G-24.svg.pdf and b/static/img_original/ch3-Z-G-24.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-25.svg b/static/img_original/ch3-Z-G-25.svg
index aae04573b..1f90961de 100644
--- a/static/img_original/ch3-Z-G-25.svg
+++ b/static/img_original/ch3-Z-G-25.svg
@@ -29,8 +29,8 @@
id="namedview40"
showgrid="false"
inkscape:zoom="3.9457062"
- inkscape:cx="210.41814"
- inkscape:cy="44.2137"
+ inkscape:cx="274.41175"
+ inkscape:cy="93.887951"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
@@ -93,7 +93,7 @@
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467574;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467574;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.70866144;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.70866144;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.70866144;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.53149605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
D
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times LT Std';-inkscape-font-specification:'Times LT Std Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">D
E
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times LT Std';-inkscape-font-specification:'Times LT Std Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">E
A
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times LT Std';-inkscape-font-specification:'Times LT Std Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">A
B
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times LT Std';-inkscape-font-specification:'Times LT Std Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">B
S
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times LT Std';-inkscape-font-specification:'Times LT Std Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">S
C
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times LT Std';-inkscape-font-specification:'Times LT Std Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">C
diff --git a/static/img_original/ch3-Z-G-25.svg.pdf b/static/img_original/ch3-Z-G-25.svg.pdf
index f6f39c0dc..10a29d9e6 100644
Binary files a/static/img_original/ch3-Z-G-25.svg.pdf and b/static/img_original/ch3-Z-G-25.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-26.svg b/static/img_original/ch3-Z-G-26.svg
index 84cb57c2c..2eb180ac8 100644
--- a/static/img_original/ch3-Z-G-26.svg
+++ b/static/img_original/ch3-Z-G-26.svg
@@ -29,8 +29,8 @@
id="namedview48"
showgrid="false"
inkscape:zoom="4"
- inkscape:cx="200.98792"
- inkscape:cy="85.954428"
+ inkscape:cx="312.1293"
+ inkscape:cy="80.715481"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
@@ -77,7 +77,7 @@
image/svg+xml
-
+
@@ -93,7 +93,7 @@
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467538;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467538;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467538;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467538;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467538;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467538;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467538;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467538;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467538;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467538;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467538;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467538;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
half-adder
half-adder
+ y="240.96609"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times LT Std';-inkscape-font-specification:'Times LT Std';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">adder
A
+ style="-inkscape-font-specification:'Times LT Std Italic';font-family:'Times LT Std';font-weight:normal;font-style:italic;font-stretch:normal;font-variant:normal;font-size:22px;text-anchor:end;text-align:end;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal">A
B
+ style="-inkscape-font-specification:'Times LT Std Italic';font-family:'Times LT Std';font-weight:normal;font-style:italic;font-stretch:normal;font-variant:normal;font-size:22px;text-anchor:end;text-align:end;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal">B
C
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times LT Std';-inkscape-font-specification:'Times LT Std Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">C
SUM
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times LT Std';-inkscape-font-specification:'Times LT Std Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">SUM
C
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times LT Std';-inkscape-font-specification:'Times LT Std Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">C
or
+ style="-inkscape-font-specification:'Times LT Std';font-family:'Times LT Std';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:22px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal">or
in
out
diff --git a/static/img_original/ch3-Z-G-26.svg.pdf b/static/img_original/ch3-Z-G-26.svg.pdf
index bd2e6afdb..19a101764 100644
Binary files a/static/img_original/ch3-Z-G-26.svg.pdf and b/static/img_original/ch3-Z-G-26.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-27.svg b/static/img_original/ch3-Z-G-27.svg
index a175c1b12..9841de8ee 100644
--- a/static/img_original/ch3-Z-G-27.svg
+++ b/static/img_original/ch3-Z-G-27.svg
@@ -28,8 +28,8 @@
id="namedview140"
showgrid="false"
inkscape:zoom="4"
- inkscape:cx="307.53211"
- inkscape:cy="61.912326"
+ inkscape:cx="252.15711"
+ inkscape:cy="71.912326"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
@@ -78,7 +78,7 @@
image/svg+xml
-
+
@@ -99,31 +99,31 @@
x="123.75862"
y="309.90778"
id="rect6788"
- style="fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:1.01467311;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467311;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467311;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467311;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467311;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467311;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467311;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467311;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467311;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467311;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467311;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467311;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467311;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.90908861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:7.63635466, 7.63635466;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:1.90908861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:7.63635466, 7.63635466;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:1.90908861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:7.63635466, 7.63635466;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467311;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
A
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">A
B
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">B
C
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">C
A
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">A
B
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">B
C
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">C
S
+ style="-inkscape-font-specification:'Times Italic';font-family:'Times';font-weight:normal;font-style:italic;font-stretch:normal;font-variant:normal;font-size:22px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal">S
C
+ style="-inkscape-font-specification:'Times Italic';font-family:'Times';font-weight:normal;font-style:italic;font-stretch:normal;font-variant:normal;font-size:22px;text-anchor:end;text-align:end;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal">C
S
+ style="-inkscape-font-specification:'Times Italic';font-family:'Times';font-weight:normal;font-style:italic;font-stretch:normal;font-variant:normal;font-size:22px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal">S
C
+ style="-inkscape-font-specification:'Times Italic';font-family:'Times';font-weight:normal;font-style:italic;font-stretch:normal;font-variant:normal;font-size:21.06666692px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">C
FA
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">FA
FA
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">FA
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467311;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
A
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">A
B
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">B
C
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">C
S
+ style="-inkscape-font-specification:'Times Italic';font-family:'Times';font-weight:normal;font-style:italic;font-stretch:normal;font-variant:normal;font-size:22px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal">S
FA
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">FA
+ style="display:inline;fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467311;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
A
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">A
B
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">B
C
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:'Times';-inkscape-font-specification:'Times Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">C
S
+ style="-inkscape-font-specification:'Times Italic';font-family:'Times';font-weight:normal;font-style:italic;font-stretch:normal;font-variant:normal;font-size:22px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal">S
FA
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">FA
= 0
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">= 0
C
+ style="-inkscape-font-specification:'Times Italic';font-family:'Times';font-weight:normal;font-style:italic;font-stretch:normal;font-variant:normal;font-size:22px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal">C
C
+ style="-inkscape-font-specification:'Times Italic';font-family:'Times';font-weight:normal;font-style:italic;font-stretch:normal;font-variant:normal;font-size:22px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal">C
-
+
-
+
-
+
-
+
@@ -52,23 +52,23 @@
-->
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
- other variables
- square:
- globalenv
- (define (square x) (* x x))
- parameters: xbody: (* x x)
- parameters: xbody: (* x x)
+ other variables
+ square:
+ globalenv
+ (define (square x) (* x x))
+ parameters: xbody: (* x x)
+ parameters: xbody: (* x x)
diff --git a/static/img_original/ch3-Z-G-3.svg.pdf b/static/img_original/ch3-Z-G-3.svg.pdf
index 1da8bad8f..6948a4322 100644
Binary files a/static/img_original/ch3-Z-G-3.svg.pdf and b/static/img_original/ch3-Z-G-3.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-30.svg b/static/img_original/ch3-Z-G-30.svg
index 3f394b69c..af5cf7549 100644
--- a/static/img_original/ch3-Z-G-30.svg
+++ b/static/img_original/ch3-Z-G-30.svg
@@ -12,7 +12,7 @@
id="svg8511"
version="1.1"
sodipodi:docname="ch3-Z-G-30.svg"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
@@ -94,7 +94,7 @@
x="106.41661"
y="86.666321"
id="rect6788-7"
- style="fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:1.01467288;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467288;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467288;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467288;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467288;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467288;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467288;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467288;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467288;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467288;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467288;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467288;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467288;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.01467288;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
m
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">m
m
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">m
p
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">p
*
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">*
p
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">p
m
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">m
m
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">m
*
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">*
u
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">u
v
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">v
32
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">32
5
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">5
9
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">9
a
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">a
a
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">a
s
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">s
+
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">+
F
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">F
C
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">C
w
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;writing-mode:lr-tb;text-anchor:end">w
x
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">x
y
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.4px;font-family:Times;-inkscape-font-specification:'Times, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">y
1
+ y="137.76205"
+ id="tspan65">1
1
+ y="137.76205"
+ id="tspan70">1
1
+ y="137.76205"
+ id="tspan75">1
2
+ y="137.76205"
+ id="tspan80">2
2
+ y="137.76205"
+ id="tspan85">2
2
+ y="137.76205"
+ id="tspan90">2
diff --git a/static/img_original/ch3-Z-G-30.svg.pdf b/static/img_original/ch3-Z-G-30.svg.pdf
index c485c5cf4..9e4951bdc 100644
Binary files a/static/img_original/ch3-Z-G-30.svg.pdf and b/static/img_original/ch3-Z-G-30.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-31.svg b/static/img_original/ch3-Z-G-31.svg
index d8b0314ee..27e43b9a7 100644
--- a/static/img_original/ch3-Z-G-31.svg
+++ b/static/img_original/ch3-Z-G-31.svg
@@ -4,37 +4,37 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -78,38 +78,38 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Peter
- Access balance: $100
- new value: 100 – 10 = 90
- set! balance to $90
- time
- Bank
- Paul
- $100
- $90
- $75
- Access balance: $100
- new value: 100 – 25 = 75
- set! balance to $75
+ Peter
+ Access balance: $100
+ new value: 100 – 10 = 90
+ set! balance to $90
+ time
+ Bank
+ Paul
+ $100
+ $90
+ $75
+ Access balance: $100
+ new value: 100 – 25 = 75
+ set! balance to $75
diff --git a/static/img_original/ch3-Z-G-31.svg.pdf b/static/img_original/ch3-Z-G-31.svg.pdf
index 43c4f6a5a..bb3e9cf93 100644
Binary files a/static/img_original/ch3-Z-G-31.svg.pdf and b/static/img_original/ch3-Z-G-31.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-32.svg b/static/img_original/ch3-Z-G-32.svg
index 6e0db86ce..6a0217b6f 100644
--- a/static/img_original/ch3-Z-G-32.svg
+++ b/static/img_original/ch3-Z-G-32.svg
@@ -4,124 +4,124 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -162,55 +162,55 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- $100
- $7
- $5
- $300
- $0
- $305
- $305
- $25
- $65
- $17
- $17
- $90
- W
- W
- D
- time
- Peter
- Bank1
- Paul
- Bank2
+ $100
+ $7
+ $5
+ $300
+ $0
+ $305
+ $305
+ $25
+ $65
+ $17
+ $17
+ $90
+ W
+ W
+ D
+ time
+ Peter
+ Bank1
+ Paul
+ Bank2
diff --git a/static/img_original/ch3-Z-G-32.svg.pdf b/static/img_original/ch3-Z-G-32.svg.pdf
index 351e9e077..d80223c64 100644
Binary files a/static/img_original/ch3-Z-G-32.svg.pdf and b/static/img_original/ch3-Z-G-32.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-35.svg b/static/img_original/ch3-Z-G-35.svg
index 58f534be3..09d2b51aa 100644
--- a/static/img_original/ch3-Z-G-35.svg
+++ b/static/img_original/ch3-Z-G-35.svg
@@ -55,7 +55,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -226,7 +226,7 @@
@@ -242,47 +242,47 @@
x="284.94791"
y="254.91293"
id="rect6788"
- style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#383838;stroke-width:1.01467335;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467335;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
filter:
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.01467335;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
sieve
@@ -331,7 +331,7 @@
y="113.64033"
id="text8841-0"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none">sieve
@@ -340,7 +340,7 @@
y="236.84477"
id="text9060"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">car
@@ -349,7 +349,7 @@
y="284.57202"
id="text9064"
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:125%;font-family:'Latin Modern Mono';-inkscape-font-specification:'Latin Modern Mono';text-align:end;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#383838;fill-opacity:1;stroke:none">cdr
@@ -359,12 +359,12 @@
cons
diff --git a/static/img_original/ch3-Z-G-35.svg.pdf b/static/img_original/ch3-Z-G-35.svg.pdf
index 75703af71..d097d9cbe 100644
Binary files a/static/img_original/ch3-Z-G-35.svg.pdf and b/static/img_original/ch3-Z-G-35.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-4.svg b/static/img_original/ch3-Z-G-4.svg
index 97695712b..4ff142ea5 100644
--- a/static/img_original/ch3-Z-G-4.svg
+++ b/static/img_original/ch3-Z-G-4.svg
@@ -4,22 +4,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -57,27 +57,27 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- E1
- (* x x)
- parameters: xbody: (* x x)
- (square 5)
- globalenv
- other variables
- square:
- x:5
+ E1
+ (* x x)
+ parameters: xbody: (* x x)
+ (square 5)
+ globalenv
+ other variables
+ square:
+ x:5
diff --git a/static/img_original/ch3-Z-G-4.svg.pdf b/static/img_original/ch3-Z-G-4.svg.pdf
index a08f938ad..72ac0ed16 100644
Binary files a/static/img_original/ch3-Z-G-4.svg.pdf and b/static/img_original/ch3-Z-G-4.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-49.svg b/static/img_original/ch3-Z-G-49.svg
index de8fadab9..426068b80 100644
--- a/static/img_original/ch3-Z-G-49.svg
+++ b/static/img_original/ch3-Z-G-49.svg
@@ -55,7 +55,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1.00000003pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -208,46 +208,46 @@
style="fill:#ffffff" />
add
cons
initial-value
integral
dt
diff --git a/static/img_original/ch3-Z-G-49.svg.pdf b/static/img_original/ch3-Z-G-49.svg.pdf
index 851694e0d..2e68df758 100644
Binary files a/static/img_original/ch3-Z-G-49.svg.pdf and b/static/img_original/ch3-Z-G-49.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-5.svg b/static/img_original/ch3-Z-G-5.svg
index f9ebde65b..9260adca9 100644
--- a/static/img_original/ch3-Z-G-5.svg
+++ b/static/img_original/ch3-Z-G-5.svg
@@ -4,34 +4,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -72,37 +72,37 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- square:
- sum-of-squares:
- f:
- globalenv
- parameters: abody: (sum-of-squares (+ a 1) (* a 2))
- parameters: xbody: (* x x)
- parameters: x,ybody: (+ (square x) (square y))
+ square:
+ sum-of-squares:
+ f:
+ globalenv
+ parameters: abody: (sum-of-squares (+ a 1) (* a 2))
+ parameters: xbody: (* x x)
+ parameters: x,ybody: (+ (square x) (square y))
diff --git a/static/img_original/ch3-Z-G-5.svg.pdf b/static/img_original/ch3-Z-G-5.svg.pdf
index f26d83cba..cdbd5bc5e 100644
Binary files a/static/img_original/ch3-Z-G-5.svg.pdf and b/static/img_original/ch3-Z-G-5.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-51.svg b/static/img_original/ch3-Z-G-51.svg
index ae62b2dc9..b9c918c14 100644
--- a/static/img_original/ch3-Z-G-51.svg
+++ b/static/img_original/ch3-Z-G-51.svg
@@ -31,7 +31,7 @@
id="namedview106"
showgrid="false"
inkscape:zoom="2.1751152"
- inkscape:cx="223.68177"
+ inkscape:cx="121.84808"
inkscape:cy="190.99285"
inkscape:window-x="0"
inkscape:window-y="0"
@@ -49,7 +49,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ id="rect24"
+ fill="white" />
@@ -252,7 +252,7 @@
x="126.71812"
y="336.09827"
id="rect6788"
- style="fill:#e8e8e8;fill-opacity:1;stroke:#383838;stroke-width:1.01467347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818779;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818779;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.0629921;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" />
+ style="fill:#e8e8e8;fill-opacity:1;stroke:#000000;stroke-width:1.01467347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.48908961;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:5.95635859, 5.95635859;stroke-dashoffset:0;marker-end:url(#Arrow1Mend);display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Mend);display:inline" />
v
R
+ x="281"
+ style="font-size:11.52381863px">R
C
+ x="331"
+ style="font-size:11.52381863px">C
i
+ x="230"
+ style="font-size:11.52381863px">i
+
+ x="229"
+ style="font-size:11.52381863px">+
--
+ x="352"
+ style="font-size:11.52381863px">--
v
+ x="292"
+ style="font-size:11.52381863px">v
R
integral
add
scale:
C
+ style="fill:none;stroke:#000000;stroke-width:0.69999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
0
0
0
+ style="fill:none;stroke:#000000;stroke-width:1.71818042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- y
- dy
- y
- integral
- map: f
- 0
+
+ y
+ dy
+ y
+ integral
+ map: f
+ 0
diff --git a/static/img_original/ch3-Z-G-52.svg.pdf b/static/img_original/ch3-Z-G-52.svg.pdf
index 9f12e2f97..cfd258b3f 100644
Binary files a/static/img_original/ch3-Z-G-52.svg.pdf and b/static/img_original/ch3-Z-G-52.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-53.svg b/static/img_original/ch3-Z-G-53.svg
index 1abe19fea..14c03c601 100644
--- a/static/img_original/ch3-Z-G-53.svg
+++ b/static/img_original/ch3-Z-G-53.svg
@@ -14,7 +14,7 @@
sodipodi:docname="ch3-Z-G-53.svg"
width="688"
height="485"
- inkscape:version="1.0.1 (c497b03c, 2020-09-10)">
+ inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
@@ -52,7 +52,7 @@
d="M 0,0 5,-5 -12.5,0 5,5 Z"
transform="matrix(-0.4,0,0,-0.4,-4,0)"
id="path4415"
- style="fill:#383838;fill-rule:evenodd;stroke:#383838;stroke-width:1pt;marker-start:none"
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
inkscape:connector-curvature="0" />
@@ -272,39 +272,39 @@
image/svg+xml
-
+
y
+ x="330.69891"
+ style="font-size:11.52380466px">y
0
0
+ x="218.96414">0
y
+ x="661.83521"
+ style="font-size:22px">y
b
integral
add
dy
+ x="409.83511"
+ style="font-size:22px">dy
ddy
+ x="120.99076"
+ style="font-size:22px">ddy
dy
+ x="207.39668"
+ style="font-size:11.52380475px">dy
diff --git a/static/img_original/ch3-Z-G-53.svg.pdf b/static/img_original/ch3-Z-G-53.svg.pdf
index b9fd08d2f..bda40184e 100644
Binary files a/static/img_original/ch3-Z-G-53.svg.pdf and b/static/img_original/ch3-Z-G-53.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-58.svg b/static/img_original/ch3-Z-G-58.svg
index fb76b4c7e..3e7bbc0bd 100644
--- a/static/img_original/ch3-Z-G-58.svg
+++ b/static/img_original/ch3-Z-G-58.svg
@@ -24,15 +24,15 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="1914"
- inkscape:window-height="2095"
+ inkscape:window-width="3840"
+ inkscape:window-height="2160"
id="namedview65"
showgrid="false"
inkscape:zoom="4.728117"
- inkscape:cx="234.5"
+ inkscape:cx="187.6526"
inkscape:cy="126"
inkscape:window-x="0"
- inkscape:window-y="32"
+ inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
+ style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818743;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818743;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mend-4)" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818743;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818743;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+ style="fill:none;stroke:#000000;stroke-width:1.48818743;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Mend-4)" />
+
+ id="tspan12010"
+ style="font-size:22px">+
--
+ id="tspan12014"
+ style="font-size:22px">--
v
+ id="tspan12018"
+ style="font-size:22px">v
R
+ id="tspan11998"
+ style="font-size:22px">R
i
+ id="tspan12006"
+ style="font-size:22px">i
L
+ id="tspan12002-9"
+ style="font-size:22px">L
v
+ id="tspan12018-3"
+ style="font-size:22px">v
+
+ id="tspan12010-4"
+ style="font-size:22px">+
--
+ id="tspan12014-9"
+ style="font-size:22px">--
C
@@ -253,102 +256,102 @@
y="182.18979"
id="text12004-5"
xml:space="preserve"
- style="font-size:24.8181572px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#383838;fill-opacity:1;stroke:none;display:inline;font-family:Linux Libertine O;-inkscape-font-specification:Sans Italic">i
+ id="tspan12006-6"
+ style="font-size:22px">i
v
+ id="tspan12018-4"
+ style="font-size:22px">v
+
+ id="tspan12010-3"
+ style="font-size:22px">+
--
+ id="tspan12014-1"
+ style="font-size:22px">--
C
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66666698px;font-family:'Linux Libertine O';-inkscape-font-specification:'Linux Libertine O Italic'">C
C
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66666698px;font-family:'Linux Libertine O';-inkscape-font-specification:'Linux Libertine O Italic'">C
R
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66666698px;font-family:'Linux Libertine O';-inkscape-font-specification:'Linux Libertine O Italic';text-align:start;text-anchor:start">R
L
+ style="font-size:14.66666667px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;font-family:Linux Libertine O;-inkscape-font-specification:Linux Libertine O Italic">L
L
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66666698px;font-family:'Linux Libertine O';-inkscape-font-specification:'Linux Libertine O Italic';text-align:start;text-anchor:start">L
R
+ style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66666698px;font-family:'Linux Libertine O';-inkscape-font-specification:'Linux Libertine O Italic';text-align:start;text-anchor:start">R
diff --git a/static/img_original/ch3-Z-G-58.svg.pdf b/static/img_original/ch3-Z-G-58.svg.pdf
index d1f2243a2..fb499e5c1 100644
Binary files a/static/img_original/ch3-Z-G-58.svg.pdf and b/static/img_original/ch3-Z-G-58.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-59.svg b/static/img_original/ch3-Z-G-59.svg
index 7746a51b3..8be7278b4 100644
--- a/static/img_original/ch3-Z-G-59.svg
+++ b/static/img_original/ch3-Z-G-59.svg
@@ -1,44 +1,178 @@
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- di
- v
- i
- v
- dv
- i
- scale: 1/L
- integral
- scale:-1/C
- integral
- scale:-R/L
- add
- C
- 0
- C
- L
- L
- 0
- L
- C
+
+ di
+ v
+ i
+ v
+ dv
+ i
+ scale: 1/L
+ integral
+ scale:-1/C
+ integral
+ scale:-R/L
+ add
+ C
+ 0
+ C
+ L
+ L
+ 0
+ L
+ C
diff --git a/static/img_original/ch3-Z-G-59.svg.pdf b/static/img_original/ch3-Z-G-59.svg.pdf
index c996fde02..2c2d7ccc7 100644
Binary files a/static/img_original/ch3-Z-G-59.svg.pdf and b/static/img_original/ch3-Z-G-59.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-6.svg b/static/img_original/ch3-Z-G-6.svg
index 94a93f820..5569ca121 100644
--- a/static/img_original/ch3-Z-G-6.svg
+++ b/static/img_original/ch3-Z-G-6.svg
@@ -4,40 +4,40 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -77,36 +77,36 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- (* x x)
- x:10
- E4
- (* x x)
- x:6
- E3
- (+ (square x) (square y))
- x:6
- y:10
- E2
- (sum-of-squares (+ a 1) (* a 2))
- a:5
- E1
- (f 5)
- globalenv
+ (* x x)
+ x:10
+ E4
+ (* x x)
+ x:6
+ E3
+ (+ (square x) (square y))
+ x:6
+ y:10
+ E2
+ (sum-of-squares (+ a 1) (* a 2))
+ a:5
+ E1
+ (f 5)
+ globalenv
diff --git a/static/img_original/ch3-Z-G-6.svg.pdf b/static/img_original/ch3-Z-G-6.svg.pdf
index 17bb1b7e5..d3a0d05b1 100644
Binary files a/static/img_original/ch3-Z-G-6.svg.pdf and b/static/img_original/ch3-Z-G-6.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-60.svg b/static/img_original/ch3-Z-G-60.svg
index 30f52da99..49ceffa20 100644
--- a/static/img_original/ch3-Z-G-60.svg
+++ b/static/img_original/ch3-Z-G-60.svg
@@ -1,23 +1,94 @@
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
-
- merge
- bankaccount
- Paul's requests
- Peter's requests
+
+ merge
+ bankaccount
+ Paul's requests
+ Peter's requests
diff --git a/static/img_original/ch3-Z-G-60.svg.pdf b/static/img_original/ch3-Z-G-60.svg.pdf
index b77c9710f..51a1a9739 100644
Binary files a/static/img_original/ch3-Z-G-60.svg.pdf and b/static/img_original/ch3-Z-G-60.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-7.svg b/static/img_original/ch3-Z-G-7.svg
index 1e5cca4e9..332d608b1 100644
--- a/static/img_original/ch3-Z-G-7.svg
+++ b/static/img_original/ch3-Z-G-7.svg
@@ -4,16 +4,16 @@
-
+
-
+
-
+
-
+
@@ -52,19 +52,19 @@
-->
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
- parameters: balancebody: (lambda (amount) (if (>= balance amount) (begin (set! balance (- balance amount)) balance) "insufficient funds"))
- globalenv
- make-withdraw:
+ parameters: balancebody: (lambda (amount) (if (>= balance amount) (begin (set! balance (- balance amount)) balance) "insufficient funds"))
+ globalenv
+ make-withdraw:
diff --git a/static/img_original/ch3-Z-G-7.svg.pdf b/static/img_original/ch3-Z-G-7.svg.pdf
index 73a4d6f93..a9b2ba5e4 100644
Binary files a/static/img_original/ch3-Z-G-7.svg.pdf and b/static/img_original/ch3-Z-G-7.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-8.svg b/static/img_original/ch3-Z-G-8.svg
index f392fec6d..e8af40b0e 100644
--- a/static/img_original/ch3-Z-G-8.svg
+++ b/static/img_original/ch3-Z-G-8.svg
@@ -4,31 +4,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -65,33 +65,33 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- E1
- make-withdraw:
- W1:
- globalenv
- balance: 100
- parameters: balancebody: ...
- parameters: amountbody: (if (>= balance amount) (begin (set! balance (- balance amount)) balance) "insufficient funds")
+ E1
+ make-withdraw:
+ W1:
+ globalenv
+ balance: 100
+ parameters: balancebody: ...
+ parameters: amountbody: (if (>= balance amount) (begin (set! balance (- balance amount)) balance) "insufficient funds")
diff --git a/static/img_original/ch3-Z-G-8.svg.pdf b/static/img_original/ch3-Z-G-8.svg.pdf
index 635bc033e..6088be329 100644
Binary files a/static/img_original/ch3-Z-G-8.svg.pdf and b/static/img_original/ch3-Z-G-8.svg.pdf differ
diff --git a/static/img_original/ch3-Z-G-9.svg b/static/img_original/ch3-Z-G-9.svg
index ee47656d8..592a4372b 100644
--- a/static/img_original/ch3-Z-G-9.svg
+++ b/static/img_original/ch3-Z-G-9.svg
@@ -4,34 +4,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -68,30 +68,30 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- E1
- make-withdraw: ...
- W1:
- globalenv
- balance: 100
- parameters: amountbody: ...
-
- amount: 50
- Here is the balancethat will be changedby the set!
- (if (>= balance amount) (begin (set! balance (- balance amount)) balance) "insufficient funds")
+ E1
+ make-withdraw: ...
+ W1:
+ globalenv
+ balance: 100
+ parameters: amountbody: ...
+
+ amount: 50
+ Here is the balancethat will be changedby the set!
+ (if (>= balance amount) (begin (set! balance (- balance amount)) balance) "insufficient funds")
diff --git a/static/img_original/ch3-Z-G-9.svg.pdf b/static/img_original/ch3-Z-G-9.svg.pdf
index 99882b118..518e5c1e0 100644
Binary files a/static/img_original/ch3-Z-G-9.svg.pdf and b/static/img_original/ch3-Z-G-9.svg.pdf differ
diff --git a/static/img_original/ch3.18.svg b/static/img_original/ch3.18.svg
index b8960b299..73e20a1a5 100644
--- a/static/img_original/ch3.18.svg
+++ b/static/img_original/ch3.18.svg
@@ -38,9 +38,9 @@
-->
-
-
+
+
- Operation Resulting Queue(define q (make-queue))(insert-queue! q 'a) a(insert-queue! q 'b) a b(delete-queue! q) b(insert-queue! q 'c) b c(insert-queue! q 'd) b c d(delete-queue! q) c d
+ Operation Resulting Queue(define q (make-queue))(insert-queue! q 'a) a(insert-queue! q 'b) a b(delete-queue! q) b(insert-queue! q 'c) b c(insert-queue! q 'd) b c d(delete-queue! q) c d
diff --git a/static/img_original/ch3.18.svg.pdf b/static/img_original/ch3.18.svg.pdf
index 0aadf42ff..89f1b9795 100644
Binary files a/static/img_original/ch3.18.svg.pdf and b/static/img_original/ch3.18.svg.pdf differ
diff --git a/static/img_original/ch4-Z-G-1.svg b/static/img_original/ch4-Z-G-1.svg
index df7ed533d..ea5a43be6 100644
--- a/static/img_original/ch4-Z-G-1.svg
+++ b/static/img_original/ch4-Z-G-1.svg
@@ -4,16 +4,16 @@
-
+
-
+
-
+
-
+
@@ -52,16 +52,16 @@
-->
-
-
+
+
-
-
+
+
- Eval
- Apply
- Procedure,Arguments
- Expression,Environment
+ Eval
+ Apply
+ Procedure,Arguments
+ Expression,Environment
diff --git a/static/img_original/ch4-Z-G-1.svg.pdf b/static/img_original/ch4-Z-G-1.svg.pdf
index 85b310289..a4a0f62a6 100644
Binary files a/static/img_original/ch4-Z-G-1.svg.pdf and b/static/img_original/ch4-Z-G-1.svg.pdf differ
diff --git a/static/img_original/ch4-Z-G-2.svg b/static/img_original/ch4-Z-G-2.svg
index d0638f8d8..cee6d464d 100644
--- a/static/img_original/ch4-Z-G-2.svg
+++ b/static/img_original/ch4-Z-G-2.svg
@@ -1,44 +1,178 @@
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- =
-
-
-
+
+ =
+
+
+
- factorial
+ factorial
- --
- *
- factorial
- 6
- 720
- 1
- 1
- 1
+ --
+ *
+ factorial
+ 6
+ 720
+ 1
+ 1
+ 1
diff --git a/static/img_original/ch4-Z-G-2.svg.pdf b/static/img_original/ch4-Z-G-2.svg.pdf
index 6f217c0ce..408747f86 100644
Binary files a/static/img_original/ch4-Z-G-2.svg.pdf and b/static/img_original/ch4-Z-G-2.svg.pdf differ
diff --git a/static/img_original/ch4-Z-G-3.svg b/static/img_original/ch4-Z-G-3.svg
index 4016080a8..8ba272814 100644
--- a/static/img_original/ch4-Z-G-3.svg
+++ b/static/img_original/ch4-Z-G-3.svg
@@ -4,13 +4,13 @@
-
+
-
+
-
+
@@ -53,18 +53,18 @@
-
-
-
-
+
+
+
+
- (define (factorial n) (if (= n 1) 1 (* (factorial (- n 1)) n)))
- eval
- 6
- 720
+ (define (factorial n) (if (= n 1) 1 (* (factorial (- n 1)) n)))
+ eval
+ 6
+ 720
diff --git a/static/img_original/ch4-Z-G-3.svg.pdf b/static/img_original/ch4-Z-G-3.svg.pdf
index bd488d9b3..500d6aacd 100644
Binary files a/static/img_original/ch4-Z-G-3.svg.pdf and b/static/img_original/ch4-Z-G-3.svg.pdf differ
diff --git a/static/img_original/chip.std.pdf b/static/img_original/chip.std.pdf
index b3389bae5..8dca2e8df 100644
Binary files a/static/img_original/chip.std.pdf and b/static/img_original/chip.std.pdf differ
diff --git a/static/img_original/chip.std.svg.pdf b/static/img_original/chip.std.svg.pdf
index 644a770d7..6227b0cdd 100644
Binary files a/static/img_original/chip.std.svg.pdf and b/static/img_original/chip.std.svg.pdf differ
diff --git a/static/img_original/preserving_table.pdf b/static/img_original/preserving_table.pdf
index 2a15274b1..0ad709fb8 100644
Binary files a/static/img_original/preserving_table.pdf and b/static/img_original/preserving_table.pdf differ
diff --git a/static/img_original/preserving_table.svg.pdf b/static/img_original/preserving_table.svg.pdf
index 2cbbfccd1..2d6b41bea 100644
Binary files a/static/img_original/preserving_table.svg.pdf and b/static/img_original/preserving_table.svg.pdf differ
diff --git a/static/img_tex/ch1_1_3-1.png b/static/img_tex/ch1_1_3-1.png
deleted file mode 100644
index d154b1801..000000000
Binary files a/static/img_tex/ch1_1_3-1.png and /dev/null differ
diff --git a/static/img_tex/ch1_1_7-1.png b/static/img_tex/ch1_1_7-1.png
deleted file mode 100644
index 6c520dd21..000000000
Binary files a/static/img_tex/ch1_1_7-1.png and /dev/null differ
diff --git a/static/img_tex/ch1_1_8-1.png b/static/img_tex/ch1_1_8-1.png
deleted file mode 100644
index 4a1d9113a..000000000
Binary files a/static/img_tex/ch1_1_8-1.png and /dev/null differ
diff --git a/static/img_tex/ch2_2_2-1.png b/static/img_tex/ch2_2_2-1.png
deleted file mode 100644
index 611b0edeb..000000000
Binary files a/static/img_tex/ch2_2_2-1.png and /dev/null differ
diff --git a/static/img_tex/ch2_3_4-1.png b/static/img_tex/ch2_3_4-1.png
deleted file mode 100644
index 380f4c8da..000000000
Binary files a/static/img_tex/ch2_3_4-1.png and /dev/null differ
diff --git a/static/img_tex/ch2_3_4-2.png b/static/img_tex/ch2_3_4-2.png
deleted file mode 100644
index 380f4c8da..000000000
Binary files a/static/img_tex/ch2_3_4-2.png and /dev/null differ
diff --git a/static/img_tex/ch2_3_4-3.png b/static/img_tex/ch2_3_4-3.png
deleted file mode 100644
index f2c4fbbde..000000000
Binary files a/static/img_tex/ch2_3_4-3.png and /dev/null differ
diff --git a/static/img_tex/ch2_3_4-4.png b/static/img_tex/ch2_3_4-4.png
deleted file mode 100644
index 4876bda4e..000000000
Binary files a/static/img_tex/ch2_3_4-4.png and /dev/null differ
diff --git a/static/img_tex/ch2_4_3-1.png b/static/img_tex/ch2_4_3-1.png
deleted file mode 100644
index b06db9c0b..000000000
Binary files a/static/img_tex/ch2_4_3-1.png and /dev/null differ
diff --git a/static/img_tex/ch3_3_2-1.png b/static/img_tex/ch3_3_2-1.png
deleted file mode 100644
index aceab4c5e..000000000
Binary files a/static/img_tex/ch3_3_2-1.png and /dev/null differ
diff --git a/static/img_tex/ch3_5_2-1.png b/static/img_tex/ch3_5_2-1.png
deleted file mode 100644
index 2079801bc..000000000
Binary files a/static/img_tex/ch3_5_2-1.png and /dev/null differ