diff --git a/src/Makefile b/src/Makefile index 5994e337..70ecf4a4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -18,7 +18,7 @@ exercises.tex figures.tex: ex-fig-ref.pl ./ex-fig-ref.pl -f > figures.tex %.pdf: %.svg - inkscape -f ${DIR}/$< -C -A ${DIR}/$@ + inkscape ${DIR}/$< -C --export-filename=${DIR}/$@ clean: latexmk -CA diff --git a/src/fig/chap1/Fig1.5c.svg b/src/fig/chap1/Fig1.5c.svg index 66d4e47b..7173f85f 100644 --- a/src/fig/chap1/Fig1.5c.svg +++ b/src/fig/chap1/Fig1.5c.svg @@ -2,20 +2,21 @@ + style="display:inline" + viewBox="0 0 374.69223 233.85005" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -41,7 +42,7 @@ style="overflow:visible"> @@ -55,7 +56,7 @@ style="overflow:visible"> @@ -70,7 +71,7 @@ @@ -84,7 +85,7 @@ @@ -98,7 +99,7 @@ @@ -112,7 +113,7 @@ @@ -126,7 +127,7 @@ @@ -140,7 +141,7 @@ @@ -154,7 +155,7 @@ @@ -168,7 +169,7 @@ @@ -182,7 +183,7 @@ @@ -196,7 +197,7 @@ @@ -210,7 +211,7 @@ @@ -224,7 +225,7 @@ @@ -237,21 +238,27 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.979899" - inkscape:cx="203.92165" - inkscape:cy="107.96912" + inkscape:cx="204.30335" + inkscape:cy="107.83378" inkscape:document-units="px" inkscape:current-layer="layer3" showgrid="false" inkscape:window-width="1920" - inkscape:window-height="1004" + inkscape:window-height="1026" inkscape:window-x="0" - inkscape:window-y="24" - inkscape:window-maximized="1"> + inkscape:window-y="31" + inkscape:window-maximized="1" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + originx="843.49719" + originy="-791.38391" + spacingy="1" + spacingx="1" + units="px" /> @@ -310,93 +317,92 @@ transform="translate(843.49721,-41.743855)"> fib5   fib4 fib3   fib3 fib2 fib2 fib1  1 fib2 fib1 fib1 fib0 fib1 fib0  1 1 0 1 0fib1 fib0  1 0 @@ -496,72 +502,72 @@ style="display:inline" transform="translate(843.49721,-41.743855)"> diff --git a/src/fig/chap5/Fig5.7b.svg b/src/fig/chap5/Fig5.7b.svg index d16d33b2..12b6b229 100644 --- a/src/fig/chap5/Fig5.7b.svg +++ b/src/fig/chap5/Fig5.7b.svg @@ -2,19 +2,20 @@ + inkscape:version="1.4 (e7c3feb100, 2024-10-09)" + sodipodi:docname="Fig5.7b.svg" + viewBox="0 0 435.23276 297.87387" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -41,7 +42,7 @@ @@ -55,7 +56,7 @@ @@ -69,7 +70,7 @@ @@ -83,7 +84,7 @@ @@ -97,7 +98,7 @@ @@ -111,7 +112,7 @@ @@ -125,7 +126,7 @@ @@ -139,7 +140,7 @@ @@ -153,7 +154,7 @@ @@ -167,7 +168,7 @@ @@ -181,7 +182,7 @@ @@ -195,7 +196,7 @@ @@ -209,7 +210,7 @@ @@ -222,21 +223,27 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.979899" - inkscape:cx="201.42202" - inkscape:cy="133.52651" + inkscape:cx="201.77797" + inkscape:cy="133.59267" inkscape:document-units="px" inkscape:current-layer="layer5" showgrid="false" inkscape:window-width="1920" - inkscape:window-height="1004" + inkscape:window-height="1026" inkscape:window-x="0" - inkscape:window-y="24" - inkscape:window-maximized="1"> + inkscape:window-y="31" + inkscape:window-maximized="1" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + originx="-64.734253" + originy="-711.00897" + spacingy="1" + spacingx="1" + units="px" /> @@ -291,122 +298,113 @@ style="display:inline" transform="translate(-64.734252,-62.096435)"> - - + - - + - - + @@ -419,55 +417,54 @@ transform="translate(-64.734252,-62.096435)"> gcd-1gcd-1 (test (op =) (reg b) (const 0)) (test (op =) (reg b) (const 0)) (branch (label after-gcd-1)) (branch (label after-gcd-1)) (assign t (op rem) (reg a) (reg b)) (assign t (op rem) (reg a) (reg b)) (assign a (reg b)) (assign a (reg b)) (assign b (reg t)) (assign b (reg t)) (goto (label gcd-1)) (goto (label gcd-1))after-gcd-1 + style="font-size:9px;line-height:140%">after-gcd-1 + style="stroke-width:0.531496;stroke-miterlimit:4;stroke-dasharray:none"> + 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" /> a + sodipodi:role="line" + style="font-size:11px;line-height:1.25">a + style="stroke-width:0.531496;stroke-miterlimit:4;stroke-dasharray:none"> + 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" /> b + sodipodi:role="line" + style="font-size:11px;line-height:1.25">b + style="stroke-width:0.531496;stroke-miterlimit:4;stroke-dasharray:none"> + 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" /> t + sodipodi:role="line" + style="font-size:11px;line-height:1.25">t rem + y="150.55341" + style="font-size:11px;line-height:1.25">rem a←b + dx="0 2 2" + style="font-size:11px;line-height:1.25">a←b t←r + dx="0 2 2" + style="font-size:11px;line-height:1.25">t←r b←t + dx="0 2 2" + style="font-size:11px;line-height:1.25">b←t + transform="translate(-20)" + style="stroke-width:0.531496;stroke-miterlimit:4;stroke-dasharray:none"> + d="m 248,162.36218 h 24 c 3,0 4.5782,-1.97512 3,-5 l -12,-23 c -1.56821,-3 -4.41037,-2.96843 -6,0 l -12,23 c -1.5782,3.02488 0,5 3,5 z" + style="display:inline;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" /> 0 + sodipodi:role="line" + style="font-size:11px;line-height:1.25">0 - + + style="display:inline;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" + cx="295" + cy="72.362183" + r="15" /> = + sodipodi:role="line" + style="font-size:11px;line-height:1.25">= + style="stroke-width:0.531496;stroke-miterlimit:4;stroke-dasharray:none"> + d="m 205,82.362183 v 10" + style="fill:none;stroke:#000000;stroke-width:0.531496;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" + cx="205" + cy="87.362183" + r="5" /> - - + - - + gcd-2gcd-2 (test (op =) (reg d) (const 0)) (test (op =) (reg d) (const 0)) (branch (label after-gcd-2)) (branch (label after-gcd-2)) (assign s (op rem) (reg c) (reg d)) (assign s (op rem) (reg c) (reg d)) (assign c (reg d)) (assign c (reg d)) (assign d (reg s)) (assign d (reg s)) (goto (label gcd-2)) (goto (label gcd-2))after-gcd-2 + style="font-size:9px;line-height:140%">after-gcd-2 + style="stroke-width:0.531496;stroke-miterlimit:4;stroke-dasharray:none"> + 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" /> c + sodipodi:role="line" + style="font-size:11px;line-height:1.25">c + style="stroke-width:0.531496;stroke-miterlimit:4;stroke-dasharray:none"> + 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" /> d + sodipodi:role="line" + style="font-size:11px;line-height:1.25">d + style="stroke-width:0.531496;stroke-miterlimit:4;stroke-dasharray:none"> + 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" /> s + sodipodi:role="line" + style="font-size:11px;line-height:1.25">s rem + y="150.55341" + style="font-size:11px;line-height:1.25">rem c←d + dx="0 2 2" + style="font-size:11px;line-height:1.25">c←d s←r + dx="0 2 2" + style="font-size:11px;line-height:1.25">s←r d←s + dx="0 2 2" + style="font-size:11px;line-height:1.25">d←s + transform="translate(-65)" + style="stroke-width:0.531496;stroke-miterlimit:4;stroke-dasharray:none"> + d="m 508,162.36218 h 24 c 3,0 4.5782,-1.97512 3,-5 l -12,-23 c -1.56821,-3 -4.41037,-2.96843 -6,0 l -12,23 c -1.5782,3.02488 0,5 3,5 z" + style="display:inline;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" /> 0 + sodipodi:role="line" + style="font-size:11px;line-height:1.25">0 - + + style="display:inline;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" + cx="295" + cy="72.362183" + r="15" /> = + sodipodi:role="line" + style="font-size:11px;line-height:1.25">=