From a693596120420430270f02735694b3b9fbd8d596 Mon Sep 17 00:00:00 2001
From: "Dr. Martin Goik" <goik@hdm-stuttgart.de>
Date: Wed, 30 Oct 2019 09:38:30 +0100
Subject: [PATCH] Flow chart corrections
---
Doc/Sd1/Ref/Statements/doWhile.svg | 545 ++++++++++++++++------
Doc/Sd1/Ref/Statements/if.svg | 89 ++--
Doc/Sd1/Ref/Statements/ifElse.svg | 271 +++++++----
Doc/Sd1/Ref/Statements/if_elseIf_else.svg | 337 +++++++------
Doc/Sd1/Ref/Statements/while.svg | 449 +++++++++++++-----
Doc/Sd1/statements.xml | 21 +-
6 files changed, 1120 insertions(+), 592 deletions(-)
diff --git a/Doc/Sd1/Ref/Statements/doWhile.svg b/Doc/Sd1/Ref/Statements/doWhile.svg
index 0eea1d925..954b97afb 100644
--- a/Doc/Sd1/Ref/Statements/doWhile.svg
+++ b/Doc/Sd1/Ref/Statements/doWhile.svg
@@ -12,7 +12,7 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="doWhile.svg"
- inkscape:version="0.92.1 r15371"
+ inkscape:version="0.92.4 (unknown)"
version="1.2"
id="svg2"
height="420"
@@ -25,27 +25,27 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.7079545"
- inkscape:cx="229.98059"
- inkscape:cy="226.15953"
+ inkscape:cx="110.8903"
+ inkscape:cy="203.93604"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1600"
- inkscape:window-height="1105"
+ inkscape:window-height="1145"
inkscape:window-x="0"
- inkscape:window-y="0"
+ inkscape:window-y="27"
inkscape:window-maximized="1"
- showguides="false"
+ showguides="true"
inkscape:guide-bbox="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0">
<inkscape:grid
- originy="-262.20473"
- originx="0"
+ type="xygrid"
id="grid1569"
- type="xygrid" />
+ originx="0"
+ originy="-262.20473" />
</sodipodi:namedview>
<defs
id="defs4">
@@ -770,6 +770,156 @@
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-5-5"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-4-3"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-5-1"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-4-8"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-5-7"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-4-0"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-5-2"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-4-7"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:isstock="true"
+ style="overflow:visible"
+ id="marker11618-6-5-2G"
+ refX="0"
+ refY="0"
+ orient="auto"
+ inkscape:stockid="marker11618-6-5-2G">
+ <path
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+ style="stroke-opacity:1;fill-rule:evenodd;fill-opacity:1;stroke:#008000;stroke-width:1.00000003pt;fill:#008000"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ id="path4042"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:isstock="true"
+ style="overflow:visible"
+ id="marker11618-6-5-2G-3"
+ refX="0"
+ refY="0"
+ orient="auto"
+ inkscape:stockid="marker11618-6-5-2G">
+ <path
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+ style="fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:#008000;stroke-width:1.00000003pt;stroke-opacity:1"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ id="path4042-8"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-5-5-8"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-4-3-4"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-5-1-8"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-4-8-2"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-5-1-2"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-4-8-7"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-5-5-8-6"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-4-3-4-2"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
</defs>
<metadata
id="metadata7">
@@ -788,108 +938,43 @@
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
- <text
- id="text3004"
- y="415.68225"
- x="104.51711"
- style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
- xml:space="preserve"><tspan
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.06666672"
- y="415.68225"
- x="104.51711"
- id="tspan3006"
- sodipodi:role="line">Â </tspan></text>
<text
id="text135"
- y="597.2785"
- x="24.408674"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none;"
+ y="666.76886"
+ x="12.655412"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
- y="597.2785"
- x="24.408674"
- id="tspan133"
- sodipodi:role="line">condition</tspan><tspan
id="tspan137"
- y="637.2785"
- x="24.408674"
- sodipodi:role="line">is true</tspan></text>
+ y="666.76886"
+ x="12.655412"
+ sodipodi:role="line">condition</tspan><tspan
+ y="686.76886"
+ x="12.655412"
+ sodipodi:role="line"
+ id="tspan4122">is true</tspan></text>
<text
id="text141"
- y="751.79156"
- x="246.39575"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none"
+ y="740.93298"
+ x="328.57791"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
- y="751.79156"
- x="246.39575"
- id="tspan139"
- sodipodi:role="line">condition</tspan><tspan
id="tspan143"
- y="791.79156"
- x="246.39575"
- sodipodi:role="line">is false</tspan></text>
- <g
- transform="translate(40,-24.99999)"
- id="g4813">
- <path
- style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 50,702.51971 120,50 110,-50 -110,-50 z"
- id="path145"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="90.891823"
- y="712.51971"
- id="text4458"><tspan
- sodipodi:role="line"
- id="tspan4456"
- x="90.891823"
- y="712.51971">Condition</tspan></text>
- </g>
- <g
- transform="translate(-40,-274.99999)"
- id="g4808">
- <rect
- style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
- id="rect4803"
- width="200"
- height="40"
- x="150"
- y="782.51971" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="160"
- y="812.51971"
- id="text4462"><tspan
- sodipodi:role="line"
- id="tspan4460"
- x="160"
- y="812.51971">Code block</tspan></text>
- </g>
- <circle
- r="5"
- cy="377.51971"
- cx="55"
- id="path4820"
- style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <ellipse
- ry="30"
- rx="80"
- cy="482.51971"
- cx="130"
- id="path4824"
- style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ y="740.93298"
+ x="328.57791"
+ sodipodi:role="line">condition</tspan><tspan
+ y="760.93298"
+ x="328.57791"
+ sodipodi:role="line"
+ id="tspan4124">is false</tspan></text>
<ellipse
ry="10.051409"
rx="9.9901352"
- cy="452.49548"
- cx="209.45428"
+ cy="449.80557"
+ cx="203.75"
id="path4828"
style="fill:#000000;stroke:none;stroke-width:0.57854682;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
- transform="translate(-73.821037,259.10369)"
+ transform="translate(-81.322845,266.84619)"
id="g4849">
<ellipse
style="fill:#000000;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -907,27 +992,209 @@
ry="19.497755" />
</g>
<path
- inkscape:connector-curvature="0"
- id="path4851-6"
- d="m 210,462.51973 v 39.99999"
- style="fill:none;stroke:#000000;stroke-width:2.26778674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6)" />
- <path
- sodipodi:nodetypes="ccccc"
+ sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path4851-6-7"
- d="M 90,677.51972 H 50 10 v -150 h 95"
+ d="m 115,717.51972 c -38.333333,0 -76.666667,0 -115,0 v -165 h 95"
style="fill:none;stroke:#008000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-9)" />
<path
- sodipodi:nodetypes="ccccc"
+ sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path4851-6-2"
- d="m 320,677.51972 h 80 v 85 H 210 v 40"
+ d="m 295,717.51972 h 115 c 0,23.33333 0,36.66667 0,60 H 305"
style="fill:none;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-4)" />
+ <g
+ id="g5353"
+ transform="translate(-126.25,19.041069)">
+ <path
+ style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 240,698.55246 90,18.96726 90,-18.96726 -90,-21.03274 z"
+ id="path145-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="287.94531"
+ y="703.48083"
+ id="text4458-0"><tspan
+ sodipodi:role="line"
+ id="tspan4456-7"
+ x="287.94531"
+ y="703.48083">0 != value</tspan></text>
+ <circle
+ style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path4820-2"
+ cx="330"
+ cy="697.51599"
+ r="5" />
+ </g>
+ <g
+ transform="translate(22.5,-22.461139)"
+ id="g1535">
+ <g
+ transform="translate(-40,-1.2125188)"
+ id="g408">
+ <rect
+ y="513.73224"
+ x="180"
+ height="21.625427"
+ width="82.5"
+ id="rect4803-6"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ ry="0" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="144.13281"
+ y="526.93378"
+ id="text4462-7"><tspan
+ sodipodi:role="line"
+ id="tspan4460-5"
+ x="144.13281"
+ y="526.93378">sum = 0</tspan></text>
+ </g>
+ <g
+ transform="translate(-40,29.365871)"
+ id="g1535-7">
+ <g
+ transform="translate(-40,-1.2125188)"
+ id="g408-2">
+ <rect
+ y="513.73224"
+ x="180"
+ height="22.213579"
+ width="207.5"
+ id="rect4803-6-9"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ ry="0" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="144.13281"
+ y="526.93378"
+ id="text4462-7-0"><tspan
+ sodipodi:role="line"
+ id="tspan4460-5-5"
+ x="144.13281"
+ y="526.93378">...("Enter value ...</tspan></text>
+ </g>
+ <g
+ transform="translate(-3.75,131.9826)"
+ id="g1535-7-0">
+ <g
+ transform="translate(-40,-1.2125188)"
+ id="g408-2-4">
+ <rect
+ y="513.73224"
+ x="180"
+ height="20.316469"
+ width="135"
+ id="rect4803-6-9-1"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ ry="0" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="144.13281"
+ y="526.93378"
+ id="text4462-7-0-7"><tspan
+ sodipodi:role="line"
+ id="tspan4460-5-5-9"
+ x="144.13281"
+ y="526.93378">sum += value</tspan></text>
+ </g>
+ <g
+ transform="translate(-32.5,255.7756)"
+ id="g1535-7-0-3">
+ <g
+ transform="translate(-40,-1.2125188)"
+ id="g408-2-4-6">
+ <rect
+ y="513.73224"
+ x="180"
+ height="20.904619"
+ width="192.5"
+ id="rect4803-6-9-1-2"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ ry="0" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="144.13281"
+ y="526.93378"
+ id="text4462-7-0-7-1"><tspan
+ sodipodi:role="line"
+ id="tspan4460-5-5-9-2"
+ x="144.13281"
+ y="526.93378">println("Sum: " + sum)</tspan></text>
+ </g>
<path
inkscape:connector-curvature="0"
- id="path4851-6-74"
- d="m 210,552.51972 v 65"
- style="fill:none;stroke:#000000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5)" />
+ id="path4851-6-74-9"
+ d="m 203.75,452.51972 v 30"
+ style="fill:none;stroke:#000000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-5)"
+ sodipodi:nodetypes="cc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4851-6-74-8"
+ d="m 203.75,507.51972 v 30"
+ style="fill:none;stroke:#000000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-1)"
+ sodipodi:nodetypes="cc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4851-6-74-9-4"
+ d="m 203.75,657.51972 v 30"
+ style="fill:none;stroke:#000000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-5-8)"
+ sodipodi:nodetypes="cc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4851-6-74-8-4"
+ d="m 203.75,557.51972 v 30"
+ style="fill:none;stroke:#000000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-1-8)"
+ sodipodi:nodetypes="cc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4851-6-74-8-7"
+ d="m 203.75,607.51972 v 30"
+ style="fill:none;stroke:#000000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-1-2)"
+ sodipodi:nodetypes="cc" />
+ <g
+ id="g420"
+ transform="translate(-46.25,1.7810185)">
+ <g
+ transform="translate(-25,78.787481)"
+ id="g408-2-4-7">
+ <rect
+ y="513.73224"
+ x="180"
+ height="20"
+ width="190"
+ id="rect4803-6-9-1-5"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ ry="0" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="159.13281"
+ y="606.93378"
+ id="text4462-7-0-7-3"><tspan
+ sodipodi:role="line"
+ id="tspan4460-5-5-9-5"
+ x="159.13281"
+ y="606.93378">value = scanner ...</tspan></text>
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ id="path4851-6-74-9-4-9"
+ d="m 203.75,782.51972 v 30"
+ style="fill:none;stroke:#000000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-5-8-6)"
+ sodipodi:nodetypes="cc" />
</g>
<script
id="sozi-script"
@@ -935,19 +1202,6 @@
<style
id="sozi-style"
ns1:version="14.10-05142318">#sozi-toc text{fill:#eff;font-family:Verdana,sans-serif;font-size:12pt}#sozi-toc text:hover{fill:#0cf;cursor:pointer}#sozi-toc text.sozi-toc-current{fill:#fa4}#sozi-toc-background{stroke:#222;stroke-opacity:.1;stroke-width:10;fill:#222;fill-opacity:.9}.sozi-toc-arrow{fill:#eff;fill-opacity:.75;stroke:none}.sozi-toc-arrow:hover{fill:#0cf}#sozi-framenumber circle{stroke:#222;stroke-opacity:.1;stroke-width:4;fill:#222;fill-opacity:.9}#sozi-framenumber text{fill:#eff;font-family:Verdana,sans-serif;font-size:12pt}</style>
- <ns1:frame
- ns1:refid="rect10351"
- ns1:title="Gcd implementation"
- ns1:sequence="1"
- ns1:hide="true"
- ns1:clip="true"
- ns1:show-in-frame-list="true"
- ns1:timeout-enable="false"
- ns1:timeout-ms="5000.0"
- ns1:transition-duration-ms="1000.0"
- ns1:transition-zoom-percent="0.0"
- ns1:transition-profile="linear"
- ns1:transition-path-hide="true" />
<ns1:frame
ns1:transition-path-hide="true"
ns1:transition-profile="linear"
@@ -958,13 +1212,13 @@
ns1:show-in-frame-list="true"
ns1:clip="true"
ns1:hide="true"
- ns1:sequence="2"
- ns1:title="Gcd maven packaging"
- ns1:refid="rect10841" />
+ ns1:sequence="1"
+ ns1:title="Gcd implementation"
+ ns1:refid="rect10351" />
<ns1:frame
- ns1:refid="rect11089"
- ns1:title="Using Math.getGcd()"
- ns1:sequence="3"
+ ns1:refid="rect10841"
+ ns1:title="Gcd maven packaging"
+ ns1:sequence="2"
ns1:hide="true"
ns1:clip="true"
ns1:show-in-frame-list="true"
@@ -984,13 +1238,13 @@
ns1:show-in-frame-list="true"
ns1:clip="true"
ns1:hide="true"
- ns1:sequence="4"
- ns1:title="Fraction project"
- ns1:refid="rect11381" />
+ ns1:sequence="3"
+ ns1:title="Using Math.getGcd()"
+ ns1:refid="rect11089" />
<ns1:frame
- ns1:refid="rect11637"
- ns1:title="Maven dependency definition"
- ns1:sequence="5"
+ ns1:refid="rect11381"
+ ns1:title="Fraction project"
+ ns1:sequence="4"
ns1:hide="true"
ns1:clip="true"
ns1:show-in-frame-list="true"
@@ -1003,14 +1257,27 @@
<ns1:frame
ns1:transition-path-hide="true"
ns1:transition-profile="linear"
- ns1:transition-zoom-percent="0"
- ns1:transition-duration-ms="1000"
- ns1:timeout-ms="5000"
+ ns1:transition-zoom-percent="0.0"
+ ns1:transition-duration-ms="1000.0"
+ ns1:timeout-ms="5000.0"
ns1:timeout-enable="false"
ns1:show-in-frame-list="true"
ns1:clip="true"
ns1:hide="true"
- ns1:sequence="6"
+ ns1:sequence="5"
+ ns1:title="Maven dependency definition"
+ ns1:refid="rect11637" />
+ <ns1:frame
+ ns1:refid="rect11895"
ns1:title="Fraction depends on Gcd"
- ns1:refid="rect11895" />
+ ns1:sequence="6"
+ ns1:hide="true"
+ ns1:clip="true"
+ ns1:show-in-frame-list="true"
+ ns1:timeout-enable="false"
+ ns1:timeout-ms="5000"
+ ns1:transition-duration-ms="1000"
+ ns1:transition-zoom-percent="0"
+ ns1:transition-profile="linear"
+ ns1:transition-path-hide="true" />
</svg>
diff --git a/Doc/Sd1/Ref/Statements/if.svg b/Doc/Sd1/Ref/Statements/if.svg
index fc4c410a4..211dd6a56 100644
--- a/Doc/Sd1/Ref/Statements/if.svg
+++ b/Doc/Sd1/Ref/Statements/if.svg
@@ -12,7 +12,7 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="if.svg"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ inkscape:version="0.92.4 (unknown)"
version="1.2"
id="svg2"
height="420"
@@ -24,17 +24,17 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="4.8308248"
- inkscape:cx="250.39309"
- inkscape:cy="179.46366"
+ inkscape:zoom="3.415909"
+ inkscape:cx="179.36843"
+ inkscape:cy="296.34513"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
- inkscape:window-width="3275"
- inkscape:window-height="1714"
- inkscape:window-x="430"
- inkscape:window-y="176"
- inkscape:window-maximized="0"
+ inkscape:window-width="1600"
+ inkscape:window-height="1145"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
showguides="false"
inkscape:guide-bbox="true"
fit-margin-top="0"
@@ -850,17 +850,17 @@
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4851-6-2"
- d="m 275,607.51972 h 110 v 70 40 H 215"
+ d="m 300,607.51972 h 85 v 70 40 H 215"
style="fill:none;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-4)" />
<text
id="text135"
y="648.48456"
- x="69.117188"
+ x="50.0625"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
id="tspan137"
y="648.48456"
- x="69.117188"
+ x="50.0625"
sodipodi:role="line">condition is true</tspan></text>
<text
id="text141"
@@ -884,29 +884,29 @@
id="tspan3006"
sodipodi:role="line">Â </tspan></text>
<g
- id="g4903"
- transform="translate(435,123.96726)">
+ id="g424"
+ transform="translate(1.24997,-1.2125188)">
<path
style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m -290,483.55246 65,18.96726 65,-18.96726 -65,-21.03274 z"
+ d="m 120,607.51972 90,18.96726 90,-18.96726 -90,-21.03274 z"
id="path145"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="-263.08676"
- y="488.48456"
+ x="143.24219"
+ y="611.93378"
id="text4458"><tspan
sodipodi:role="line"
id="tspan4456"
- x="-263.08676"
- y="488.48456">Condition</tspan></text>
+ x="143.24219"
+ y="611.93378">1000 <= saving</tspan></text>
<circle
style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4820"
- cx="-210.13754"
- cy="492.51971"
+ cx="224.86246"
+ cy="616.487"
r="5" />
</g>
<ellipse
@@ -954,26 +954,29 @@
style="fill:none;stroke:#000000;stroke-width:2.26778674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-43)"
sodipodi:nodetypes="cc" />
<g
- id="g4866"
- transform="translate(432.49994,106.21252)">
- <rect
- ry="0"
- style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
- id="rect4803-6"
- width="115.00012"
- height="19.999994"
- x="-280"
- y="407.51971" />
+ id="g1535">
+ <g
+ transform="translate(-40,-1.2125188)"
+ id="g408">
+ <rect
+ y="513.73224"
+ x="180"
+ height="20"
+ width="140"
+ id="rect4803-6"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ ry="0" />
+ </g>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="-275.13754"
- y="422.51971"
+ x="144.13281"
+ y="526.93378"
id="text4462-7"><tspan
sodipodi:role="line"
id="tspan4460-5"
- x="-275.13754"
- y="422.51971">Code block 1</tspan></text>
+ x="144.13281"
+ y="526.93378">saving = 320.00</tspan></text>
</g>
<rect
y="902.51971"
@@ -994,13 +997,13 @@
sodipodi:role="line">Code block</tspan></text>
<g
id="g4866-2"
- transform="translate(432.49994,271.72204)">
+ transform="translate(409.99994,270.50952)">
<rect
ry="0"
style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
id="rect4803-6-7"
- width="115.00012"
- height="19.999994"
+ width="162.50006"
+ height="18.277966"
x="-280"
y="407.51971" />
<text
@@ -1012,17 +1015,17 @@
sodipodi:role="line"
id="tspan4460-5-9"
x="-275.13754"
- y="422.51971">Code block 2</tspan></text>
+ y="422.51971">...print("Interest:...)</tspan></text>
</g>
<g
id="g4866-3"
- transform="translate(432.49994,342.90739)">
+ transform="translate(427.49994,341.69487)">
<rect
ry="0"
style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
id="rect4803-6-6"
- width="115.00012"
- height="19.999994"
+ width="127.50006"
+ height="22.092615"
x="-280"
y="407.51971" />
<text
@@ -1034,7 +1037,7 @@
sodipodi:role="line"
id="tspan4460-5-2"
x="-275.13754"
- y="422.51971">Code block 3</tspan></text>
+ y="422.51971">...print("Done")</tspan></text>
</g>
<path
inkscape:connector-curvature="0"
diff --git a/Doc/Sd1/Ref/Statements/ifElse.svg b/Doc/Sd1/Ref/Statements/ifElse.svg
index a9ae66dd6..0f96e07ed 100644
--- a/Doc/Sd1/Ref/Statements/ifElse.svg
+++ b/Doc/Sd1/Ref/Statements/ifElse.svg
@@ -12,7 +12,7 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="ifElse.svg"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ inkscape:version="0.92.4 (unknown)"
version="1.2"
id="svg2"
height="420"
@@ -24,17 +24,17 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.4154124"
- inkscape:cx="151.29324"
- inkscape:cy="243.60754"
+ inkscape:zoom="3.415909"
+ inkscape:cx="242.93019"
+ inkscape:cy="231.10041"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
- inkscape:window-width="1934"
- inkscape:window-height="1448"
- inkscape:window-x="1088"
- inkscape:window-y="316"
- inkscape:window-maximized="0"
+ inkscape:window-width="1600"
+ inkscape:window-height="1145"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
showguides="false"
inkscape:guide-bbox="true"
fit-margin-top="0"
@@ -815,6 +815,36 @@
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-93"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-6"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-93-6"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-6-2"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
</defs>
<metadata
id="metadata7">
@@ -836,74 +866,71 @@
<path
inkscape:connector-curvature="0"
id="path4851-6-7-9"
- d="m 55,712.51972 135,100"
+ d="m 85,697.51972 55,50"
style="fill:none;stroke:#000000;stroke-width:2.26778674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-43-6)"
sodipodi:nodetypes="cc" />
<path
inkscape:connector-curvature="0"
id="path4851-6-74-0"
- d="m 270,577.51972 h 85 v 110"
+ d="m 290,607.51972 h 50 v 65"
style="fill:none;stroke:#ff0000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-9)"
sodipodi:nodetypes="ccc" />
<path
inkscape:connector-curvature="0"
id="path4851-6-74"
- d="M 150,577.51972 H 60 v 115"
+ d="M 120,607.51972 H 75 v 65"
style="fill:none;stroke:#008000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5)"
sodipodi:nodetypes="ccc" />
<text
id="text3004"
y="415.68225"
- x="104.51711"
+ x="204.99997"
style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
xml:space="preserve"><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.06666672"
y="415.68225"
- x="104.51711"
+ x="204.99997"
id="tspan3006"
sodipodi:role="line">Â </tspan></text>
- <text
- id="text135"
- y="565.32806"
- x="3.0466938"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none"
- xml:space="preserve"><tspan
- id="tspan137"
- y="565.32806"
- x="3.0466938"
- sodipodi:role="line">condition is true</tspan></text>
- <text
- id="text141"
- y="561.95306"
- x="271.14081"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none"
- xml:space="preserve"><tspan
- id="tspan143"
- y="561.95306"
- x="271.14081"
- sodipodi:role="line">condition is false</tspan></text>
+ <g
+ id="g1653"
+ transform="translate(-1.1709914,19.906854)">
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none"
+ x="2.1960166"
+ y="575.09259"
+ id="text135"><tspan
+ sodipodi:role="line"
+ x="2.1960166"
+ y="575.09259"
+ id="tspan137">condition is true</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none"
+ x="272.60785"
+ y="575.09259"
+ id="text141"><tspan
+ sodipodi:role="line"
+ x="272.60785"
+ y="575.09259"
+ id="tspan143">condition is false</tspan></text>
+ </g>
<circle
r="5"
cy="377.51971"
cx="55"
id="path4820"
style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <ellipse
- ry="30"
- rx="80"
- cy="482.51971"
- cx="130"
- id="path4824"
- style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<ellipse
ry="10.051409"
rx="9.9901352"
- cy="452.49548"
- cx="209.45428"
+ cy="457.17307"
+ cx="204.99997"
id="path4828"
style="fill:#000000;stroke:none;stroke-width:0.57854682;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
- transform="translate(-73.821037,259.10369)"
+ transform="translate(-80.072875,268.47162)"
id="g4849">
<ellipse
style="fill:#000000;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -923,89 +950,153 @@
<path
inkscape:connector-curvature="0"
id="path4851-6"
- d="m 210,462.51973 v 89.99999"
+ d="m 205,467.51973 v 44.99999"
style="fill:none;stroke:#000000;stroke-width:2.26778674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6)"
sodipodi:nodetypes="cc" />
<path
inkscape:connector-curvature="0"
id="path4851-6-7"
- d="m 360,712.51972 -130,100"
+ d="m 310,697.51972 -50,50"
style="fill:none;stroke:#000000;stroke-width:2.26778674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-43)"
sodipodi:nodetypes="cc" />
<g
- id="g5466"
- transform="translate(0,26.31497)">
+ id="g424"
+ transform="translate(-5.0000295,1.7325)">
+ <path
+ style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 120.00003,605.78722 210,626.48698 300.00003,605.78722 210,586.48698 Z"
+ id="path145"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="143.24219"
+ y="611.93378"
+ id="text4458"><tspan
+ sodipodi:role="line"
+ id="tspan4456"
+ x="143.24219"
+ y="611.93378">1000 <= saving</tspan></text>
+ <circle
+ style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path4820-7"
+ cx="224.86246"
+ cy="616.487"
+ r="5" />
+ </g>
+ <g
+ id="g4866-3"
+ transform="translate(421.24994,341.68733)">
+ <rect
+ ry="0"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ id="rect4803-6-6"
+ width="127.50006"
+ height="22.092615"
+ x="-280"
+ y="407.51971" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="-275.13754"
+ y="422.51971"
+ id="text4462-7-06"><tspan
+ sodipodi:role="line"
+ id="tspan4460-5-2"
+ x="-275.13754"
+ y="422.51971">...print("Done")</tspan></text>
+ </g>
+ <g
+ transform="translate(-5.0000295,4.4320498)"
+ id="g1535">
<g
- transform="translate(280,262.50001)"
- id="g4866">
+ transform="translate(-40,-1.2125188)"
+ id="g408-3">
+ <rect
+ y="513.73224"
+ x="180"
+ height="20"
+ width="140"
+ id="rect4803-6-5"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ ry="0" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="144.13281"
+ y="526.93378"
+ id="text4462-7-6"><tspan
+ sodipodi:role="line"
+ id="tspan4460-5-29"
+ x="144.13281"
+ y="526.93378">saving = 320.00</tspan></text>
+ </g>
+ <g
+ id="g1634"
+ transform="translate(0,-28.039981)">
+ <g
+ transform="translate(279.99994,300.25476)"
+ id="g4866-2">
<rect
y="407.51971"
x="-280"
- height="19.999994"
- width="115.00012"
- id="rect4803-6-0"
+ height="19.490486"
+ width="150.00006"
+ id="rect4803-6-7"
style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
ry="0" />
<text
- id="text4462-7"
+ id="text4462-7-0"
y="422.51971"
x="-275.13754"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="422.51971"
x="-275.13754"
- id="tspan4460-5"
- sodipodi:role="line">Code block 1</tspan></text>
+ id="tspan4460-5-9"
+ sodipodi:role="line">...print(... <tspan
+ style="fill:#008000"
+ id="tspan1676">1.2</tspan> * ...)</tspan></text>
</g>
<g
- transform="translate(575,262.50001)"
- id="g4866-2">
+ transform="translate(537.49994,300.00001)"
+ id="g4866-2-1">
<rect
y="407.51971"
x="-280"
- height="19.999994"
- width="115.00012"
- id="rect4803-6-7"
+ height="19.999996"
+ width="152.50006"
+ id="rect4803-6-7-2"
style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
ry="0" />
<text
- id="text4462-7-0"
+ id="text4462-7-0-7"
y="422.51971"
x="-275.13754"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
y="422.51971"
x="-275.13754"
- id="tspan4460-5-9"
- sodipodi:role="line">Code block 2</tspan></text>
+ id="tspan4460-5-9-0"
+ sodipodi:role="line">...print(... <tspan
+ style="fill:#ff0000"
+ id="tspan1678">0.8</tspan> * ...)</tspan></text>
</g>
</g>
- <g
- id="g4903"
- transform="translate(435,96.928086)">
- <path
- style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m -285,480.59163 60,21.92809 65,-21.92809 -65,-18.07191 z"
- id="path145-2"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="-263.08676"
- y="488.48456"
- id="text4458-3"><tspan
- sodipodi:role="line"
- id="tspan4456-7"
- x="-263.08676"
- y="488.48456">Condition</tspan></text>
- <circle
- style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="path4820-5"
- cx="-210.13754"
- cy="492.51971"
- r="5" />
- </g>
+ <path
+ inkscape:connector-curvature="0"
+ id="path4851-6-0"
+ d="m 205,767.51972 v 50"
+ style="fill:none;stroke:#000000;stroke-width:2.26778674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-93)"
+ sodipodi:nodetypes="cc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4851-6-0-6"
+ d="m 205,532.51972 v 50"
+ style="fill:none;stroke:#000000;stroke-width:2.26778674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-93-6)"
+ sodipodi:nodetypes="cc" />
</g>
<script
id="sozi-script"
diff --git a/Doc/Sd1/Ref/Statements/if_elseIf_else.svg b/Doc/Sd1/Ref/Statements/if_elseIf_else.svg
index 2e6153a04..828e4ec28 100644
--- a/Doc/Sd1/Ref/Statements/if_elseIf_else.svg
+++ b/Doc/Sd1/Ref/Statements/if_elseIf_else.svg
@@ -11,8 +11,8 @@
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"
- sodipodi:docname="ifElse_ifElse.svg"
- inkscape:version="0.92.1 r15371"
+ sodipodi:docname="if_elseIf_else.svg"
+ inkscape:version="0.92.4 (unknown)"
version="1.2"
id="svg2"
height="441.26913"
@@ -24,16 +24,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="0.85397725"
- inkscape:cx="694.03135"
- inkscape:cy="3.2124643"
+ inkscape:zoom="1.7079545"
+ inkscape:cx="249.36716"
+ inkscape:cy="218.45259"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1600"
- inkscape:window-height="1105"
+ inkscape:window-height="1145"
inkscape:window-x="0"
- inkscape:window-y="0"
+ inkscape:window-y="27"
inkscape:window-maximized="1"
showguides="false"
inkscape:guide-bbox="true"
@@ -929,7 +929,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -942,9 +942,9 @@
id="text3004"
y="430.68225"
x="104.51711"
- style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+ style="font-style:normal;font-weight:normal;font-size:16px;line-height:0%;font-family:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672;-inkscape-font-specification:'DejaVu Sans Mono';font-stretch:normal;font-variant:normal;"
xml:space="preserve"><tspan
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.06666672"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';stroke-width:1.06666672;"
y="430.68225"
x="104.51711"
id="tspan3006"
@@ -953,7 +953,7 @@
id="text135"
y="608.18481"
x="14.893998"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none;"
xml:space="preserve"><tspan
id="tspan137"
y="608.18481"
@@ -961,35 +961,31 @@
sodipodi:role="line">true</tspan></text>
<text
id="text141"
- y="532.97717"
- x="187.32318"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none"
+ y="539.4176"
+ x="214.84148"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;"
xml:space="preserve"><tspan
id="tspan143"
- y="532.97717"
- x="187.32318"
+ y="539.4176"
+ x="214.84148"
sodipodi:role="line">false</tspan></text>
- <g
- id="g177"
- transform="translate(-145,124.99999)">
- <rect
- style="fill:#000000;stroke-width:4.16333246;stroke-miterlimit:4;stroke-dasharray:none"
- id="rect4803"
- width="130"
- height="40"
- x="85"
- y="647.51971" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="95"
- y="677.51971"
- id="text4462"><tspan
- sodipodi:role="line"
- id="tspan4460"
- x="95"
- y="677.51971">Block 1</tspan></text>
- </g>
+ <rect
+ y="772.51971"
+ x="-60"
+ height="40"
+ width="130"
+ id="rect4803"
+ style="fill:#000000;stroke-width:4.16333246;stroke-miterlimit:4;stroke-dasharray:none" />
+ <text
+ id="text4462"
+ y="802.51971"
+ x="-50"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ xml:space="preserve"><tspan
+ y="802.51971"
+ x="-50"
+ id="tspan4460"
+ sodipodi:role="line">...="Excellent"</tspan></text>
<circle
r="5"
cy="377.51971"
@@ -1005,7 +1001,8 @@
style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
transform="translate(-84.403257,279.49453)"
- id="g4849">
+ id="g4849"
+ style="">
<ellipse
style="fill:#000000;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4828-7"
@@ -1022,9 +1019,11 @@
ry="19.497755" />
</g>
<g
- id="g541">
+ id="g541"
+ style="">
<g
- id="g536">
+ id="g536"
+ style="">
<ellipse
ry="10.051409"
rx="9.9901352"
@@ -1052,143 +1051,109 @@
d="M 10,812.51971 V 852.5197 H 175"
style="fill:none;stroke:#000000;stroke-width:2.26778674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-43)"
sodipodi:nodetypes="ccc" />
- <g
- id="g242"
- transform="translate(-30,-55)">
- <path
- style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 45,607.51972 105,40 95,-40 -95,-40 z"
- id="path145-6"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="100.79371"
- y="604.76978"
- id="text4458-7"><tspan
- sodipodi:role="line"
- id="tspan4456-5"
- x="100.79371"
- y="604.76978">Cond.</tspan><tspan
- id="tspan200"
- sodipodi:role="line"
- x="100.79371"
- y="644.76978"> 1</tspan></text>
- </g>
- <g
- id="g182"
- transform="translate(-201.66667,149.99999)">
- <rect
- style="fill:#000000;stroke-width:4.16333246;stroke-miterlimit:4;stroke-dasharray:none"
- id="rect4803-0"
- width="130"
- height="40"
- x="285"
- y="622.51971" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="295"
- y="652.51971"
- id="text4462-9"><tspan
- sodipodi:role="line"
- id="tspan4460-3"
- x="295"
- y="652.51971">Block 2</tspan></text>
- </g>
- <g
- id="g187"
- transform="translate(-78.333344,49.999988)"
- inkscape:transform-center-x="-18.216351"
- inkscape:transform-center-y="-9.9361914">
- <rect
- style="fill:#000000;stroke-width:4.16333246;stroke-miterlimit:4;stroke-dasharray:none"
- id="rect4803-6"
- width="130"
- height="40"
- x="305"
- y="722.51971" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="315"
- y="752.51971"
- id="text4462-0"><tspan
- sodipodi:role="line"
- id="tspan4460-6"
- x="315"
- y="752.51971">Block 3</tspan></text>
- </g>
- <g
- transform="translate(230,85)"
- id="g242-5">
- <path
- style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 45,607.51972 105,40 95,-40 -95,-40 z"
- id="path145-6-3"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="100.79371"
- y="604.76978"
- id="text4458-7-5"><tspan
- sodipodi:role="line"
- id="tspan4456-5-6"
- x="100.79371"
- y="604.76978">Cond.</tspan><tspan
- id="tspan200-2"
- sodipodi:role="line"
- x="100.79371"
- y="644.76978"> 3</tspan></text>
- </g>
- <g
- transform="translate(100,15)"
- id="g242-9">
- <path
- style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 45,607.51972 105,40 95,-40 -95,-40 z"
- id="path145-6-1"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="100.79371"
- y="604.76978"
- id="text4458-7-2"><tspan
- sodipodi:role="line"
- id="tspan4456-5-7"
- x="100.79371"
- y="604.76978">Cond.</tspan><tspan
- id="tspan200-0"
- sodipodi:role="line"
- x="100.79371"
- y="644.76978"> 2</tspan></text>
- </g>
- <g
- id="g187-9"
- transform="translate(64.999996,49.999988)">
- <rect
- style="fill:#000000;stroke-width:4.16333246;stroke-miterlimit:4;stroke-dasharray:none"
- id="rect4803-6-3"
- width="130"
- height="40"
- x="305"
- y="722.51971" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- x="315"
- y="752.51971"
- id="text4462-0-6"><tspan
- sodipodi:role="line"
- id="tspan4460-6-0"
- x="315"
- y="752.51971">Block 4</tspan></text>
- </g>
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path145-6"
+ d="m 15,552.51972 105,40 95,-40 -95,-40 z"
+ style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <text
+ id="text4458-7"
+ y="546.91425"
+ x="61.743904"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ xml:space="preserve"><tspan
+ y="546.91425"
+ x="61.743904"
+ sodipodi:role="line"
+ id="tspan200">A'==grade|| </tspan><tspan
+ y="566.91425"
+ x="61.743904"
+ sodipodi:role="line"
+ id="tspan2377">B'==grade</tspan></text>
+ <rect
+ y="772.51971"
+ x="83.333328"
+ height="40"
+ width="130"
+ id="rect4803-0"
+ style="fill:#000000;stroke-width:4.16333246;stroke-miterlimit:4;stroke-dasharray:none" />
+ <text
+ id="text4462-9"
+ y="802.51971"
+ x="93.333328"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ xml:space="preserve"><tspan
+ y="802.51971"
+ x="93.333328"
+ id="tspan4460-3"
+ sodipodi:role="line">result="O.k."</tspan></text>
+ <rect
+ y="772.51971"
+ x="226.66666"
+ height="40"
+ width="130"
+ id="rect4803-6"
+ style="fill:#000000;stroke-width:4.16333246;stroke-miterlimit:4;stroke-dasharray:none" />
+ <text
+ id="text4462-0"
+ y="802.51971"
+ x="236.66666"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;"
+ xml:space="preserve"><tspan
+ y="802.51971"
+ x="236.66666"
+ id="tspan4460-6"
+ sodipodi:role="line">...="Passed"</tspan></text>
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path145-6-3"
+ d="m 275,692.51972 105,40 95,-40 -95,-40 z"
+ style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <text
+ id="text4458-7-5"
+ y="696.93378"
+ x="322.13843"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;"
+ xml:space="preserve"><tspan
+ y="696.93378"
+ x="322.13843"
+ sodipodi:role="line"
+ id="tspan200-2">'D' == grade</tspan></text>
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path145-6-1"
+ d="m 145,622.51972 105,40 95,-40 -95,-40 z"
+ style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <text
+ id="text4458-7-2"
+ y="626.93378"
+ x="192.70094"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;"
+ xml:space="preserve"><tspan
+ y="626.93378"
+ x="192.70094"
+ sodipodi:role="line"
+ id="tspan200-0">'C' == grade</tspan></text>
+ <rect
+ y="772.51971"
+ x="370"
+ height="40"
+ width="130"
+ id="rect4803-6-3"
+ style="fill:#000000;stroke-width:4.16333246;stroke-miterlimit:4;stroke-dasharray:none" />
+ <text
+ id="text4462-0-6"
+ y="802.51971"
+ x="380"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ xml:space="preserve"><tspan
+ y="802.51971"
+ x="380"
+ id="tspan4460-6-0"
+ sodipodi:role="line">...="Failed"</tspan></text>
<path
sodipodi:nodetypes="ccc"
inkscape:connector-curvature="0"
@@ -1241,7 +1206,7 @@
id="text141-5"
y="600.87445"
x="313.24542"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;"
xml:space="preserve"><tspan
id="tspan143-0"
y="600.87445"
@@ -1251,7 +1216,7 @@
id="text141-3"
y="666.28778"
x="420.88751"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;"
xml:space="preserve"><tspan
id="tspan143-6"
y="666.28778"
@@ -1261,7 +1226,7 @@
id="text135-1"
y="674.55524"
x="147.18663"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none;"
xml:space="preserve"><tspan
id="tspan137-0"
y="674.55524"
@@ -1271,12 +1236,22 @@
id="text135-6"
y="740.22369"
x="274.76639"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none;"
xml:space="preserve"><tspan
id="tspan137-3"
y="740.22369"
x="274.76639"
sodipodi:role="line">true</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ x="80"
+ y="542.51971"
+ id="text2375"><tspan
+ sodipodi:role="line"
+ id="tspan2373"
+ x="80"
+ y="556.67596" /></text>
</g>
<script
id="sozi-script"
diff --git a/Doc/Sd1/Ref/Statements/while.svg b/Doc/Sd1/Ref/Statements/while.svg
index 33ba0aee2..20232e318 100644
--- a/Doc/Sd1/Ref/Statements/while.svg
+++ b/Doc/Sd1/Ref/Statements/while.svg
@@ -12,7 +12,7 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="while.svg"
- inkscape:version="0.92.1 r15371"
+ inkscape:version="0.92.4 (unknown)"
version="1.2"
id="svg2"
height="420"
@@ -24,23 +24,24 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.2077062"
- inkscape:cx="378.05945"
- inkscape:cy="235.43139"
+ inkscape:zoom="1.7079545"
+ inkscape:cx="257.38507"
+ inkscape:cy="195.05928"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1600"
- inkscape:window-height="1105"
+ inkscape:window-height="1145"
inkscape:window-x="0"
- inkscape:window-y="0"
+ inkscape:window-y="27"
inkscape:window-maximized="1"
showguides="false"
inkscape:guide-bbox="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
- fit-margin-bottom="0">
+ fit-margin-bottom="0"
+ inkscape:snap-global="true">
<inkscape:grid
type="xygrid"
id="grid1569"
@@ -770,6 +771,111 @@
id="path22168"
inkscape:connector-curvature="0" />
</marker>
+ <marker
+ inkscape:isstock="true"
+ style="overflow:visible"
+ id="marker11618-6-5-2G-3"
+ refX="0"
+ refY="0"
+ orient="auto"
+ inkscape:stockid="marker11618-6-5-2G">
+ <path
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+ style="fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:#008000;stroke-width:1.00000003pt;stroke-opacity:1"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ id="path4042-8"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:isstock="true"
+ style="overflow:visible"
+ id="marker11618-6-5-2G"
+ refX="0"
+ refY="0"
+ orient="auto"
+ inkscape:stockid="marker11618-6-5-2G">
+ <path
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+ style="fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:#008000;stroke-width:1.00000003pt;stroke-opacity:1"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ id="path4042"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-5-7"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-4-0"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-5-1"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-4-8"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-5-5"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-4-3"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-4-5"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-5-2"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11618-6-9-1"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path11616-5-3-0"
+ d="M 0,0 5,-5 -12.5,0 5,5 Z"
+ style="fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:#008000;stroke-width:1.00000003pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
</defs>
<metadata
id="metadata7">
@@ -788,146 +894,233 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-440.31499)">
- <path
- style="stroke-linejoin:miter;marker-end:url(#marker11618OM);stroke-opacity:1;stroke-dashoffset:0;stroke:#008000;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-width:3;fill:#008000"
- d="m 210,612.51972 v 70"
- id="path4851"
- inkscape:connector-curvature="0" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
- x="104.51711"
- y="415.68225"
- id="text3004"><tspan
- sodipodi:role="line"
- id="tspan3006"
- x="104.51711"
- y="415.68225"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.06666672">Â </tspan></text>
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none"
- x="25.672981"
- y="626.91351"
- id="text135"><tspan
- sodipodi:role="line"
- id="tspan133"
- x="25.672981"
- y="626.91351">condition</tspan><tspan
- sodipodi:role="line"
- x="25.672981"
- y="666.91351"
- id="tspan137">is true</tspan></text>
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none"
- x="245.22476"
- y="628.25201"
- id="text141"><tspan
- sodipodi:role="line"
- id="tspan139"
- x="245.22476"
- y="628.25201">condition</tspan><tspan
- sodipodi:role="line"
- x="245.22476"
- y="668.25201"
- id="tspan143">is false</tspan></text>
- <g
- id="g4813"
- transform="translate(40,-139.99998)">
- <path
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0"
- id="path145"
- d="m 50,702.51971 120,50 110,-50 -110,-50 z"
- style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <text
- id="text4458"
- y="712.51971"
- x="90.891823"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- xml:space="preserve"><tspan
- y="712.51971"
- x="90.891823"
- id="tspan4456"
- sodipodi:role="line">Condition</tspan></text>
- </g>
- <g
- id="g4808"
- transform="translate(-30,-89.999986)">
- <rect
- y="782.51971"
- x="150"
- height="40"
- width="200"
- id="rect4803"
- style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none" />
- <text
- id="text4462"
- y="812.51971"
- x="160"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
- xml:space="preserve"><tspan
- y="812.51971"
- x="160"
- id="tspan4460"
- sodipodi:role="line">Code block</tspan></text>
- </g>
<circle
style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4820"
cx="55"
cy="377.51971"
r="5" />
+ <text
+ id="text135-2"
+ y="692.74127"
+ x="6.1464019"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none"
+ xml:space="preserve"><tspan
+ id="tspan137-0"
+ y="692.74127"
+ x="6.1464019"
+ sodipodi:role="line">condition</tspan><tspan
+ y="712.74127"
+ x="6.1464019"
+ sodipodi:role="line"
+ id="tspan4122">is true</tspan></text>
+ <text
+ id="text141-6"
+ y="692.74127"
+ x="333.75565"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none"
+ xml:space="preserve"><tspan
+ id="tspan143-3"
+ y="692.74127"
+ x="333.75565"
+ sodipodi:role="line">condition</tspan><tspan
+ y="712.74127"
+ x="333.75565"
+ sodipodi:role="line"
+ id="tspan4124">is false</tspan></text>
<ellipse
- style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="path4824"
- cx="130"
- cy="482.51971"
- rx="80"
- ry="30" />
- <ellipse
- style="fill:#000000;stroke:none;stroke-width:0.57854682;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="path4828"
- cx="209.45428"
- cy="452.49548"
+ ry="10.051409"
rx="9.9901352"
- ry="10.051409" />
+ cy="452.22711"
+ cx="196.68794"
+ id="path4828-6"
+ style="fill:#000000;stroke:none;stroke-width:0.57854682;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<g
- id="g4849"
- transform="translate(-73.821037,259.10369)">
+ transform="translate(-88.384914,269.26773)"
+ id="g4849-9">
<ellipse
- ry="14.991529"
- rx="15.003441"
- cy="572.61981"
+ style="fill:#000000;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path4828-7-4"
cx="285.07419"
- id="path4828-7"
- style="fill:#000000;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ cy="572.61981"
+ rx="15.003441"
+ ry="14.991529" />
<ellipse
- ry="19.497755"
- rx="19.461161"
- cy="572.5061"
+ style="fill:none;stroke:#000000;stroke-width:0.90602088;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path4845-8"
cx="285.07285"
- id="path4845"
- style="fill:none;stroke:#000000;stroke-width:0.90602088;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ cy="572.5061"
+ rx="19.461161"
+ ry="19.497755" />
</g>
<path
- style="fill:none;stroke:#000000;stroke-width:2.26778674;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6)"
- d="m 210,462.51973 v 39.99999"
- id="path4851-6"
- inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4851-6-7-4"
+ d="M 136.68794,773.31583 H 61.687936 1.6879362 v -130 L 80,642.51972"
+ style="fill:none;stroke:#008000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-9-1)" />
<path
- style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-9)"
- d="m 210,732.51972 v 20 H 10 v -280 h 190"
- id="path4851-6-7"
+ sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc" />
+ id="path4851-6-2-0"
+ d="m 320,642.51972 91.68794,0.79611 v 80 120 h -190"
+ style="fill:none;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-4-5)" />
<path
- style="fill:none;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-4)"
- d="m 320,562.51972 80,10e-6 V 762.51972 H 210 v 40"
- id="path4851-6-2"
+ sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc" />
+ id="path145-9"
+ d="M 85.010241,642.51972 196.69818,662.05453 320.01024,642.51972 196.69818,622.05453 Z"
+ style="fill:#1a1a1a;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <text
+ id="text4458-0"
+ y="647.50134"
+ x="106.57598"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ xml:space="preserve"><tspan
+ y="647.50134"
+ x="106.57598"
+ id="tspan4456-7"
+ sodipodi:role="line">loopCount < repetitions</tspan></text>
+ <circle
+ r="5"
+ cy="652.05457"
+ cx="211.5504"
+ id="path4820-2"
+ style="fill:none;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="translate(-75.812064,-10.829318)"
+ id="g1535">
+ <g
+ transform="translate(-40,-1.2125188)"
+ id="g408">
+ <rect
+ y="513.73224"
+ x="180"
+ height="21.625444"
+ width="277.5"
+ id="rect4803-6"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ ry="0" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="144.13281"
+ y="526.93378"
+ id="text4462-7"><tspan
+ sodipodi:role="line"
+ id="tspan4460-5"
+ x="144.13281"
+ y="526.93378">repetitions = scan.nextInt()</tspan></text>
+ </g>
+ <g
+ transform="translate(-5.8120638,48.582532)"
+ id="g1535-7">
+ <g
+ transform="translate(-40,-1.2125188)"
+ id="g408-2">
+ <rect
+ y="513.73224"
+ x="180"
+ height="22.213579"
+ width="137.5"
+ id="rect4803-6-9"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ ry="0" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="144.13281"
+ y="526.93378"
+ id="text4462-7-0"><tspan
+ sodipodi:role="line"
+ id="tspan4460-5-5"
+ x="144.13281"
+ y="526.93378">loopCount = 0</tspan></text>
+ </g>
+ <g
+ transform="translate(-58.312064,190.47965)"
+ id="g1535-7-0">
+ <g
+ transform="translate(-40,-1.2125188)"
+ id="g408-2-4">
+ <rect
+ y="513.73224"
+ x="180"
+ height="20.31649"
+ width="247.5"
+ id="rect4803-6-9-1"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ ry="0" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="144.13281"
+ y="526.93378"
+ id="text4462-7-0-7"><tspan
+ sodipodi:role="line"
+ id="tspan4460-5-5-9"
+ x="144.13281"
+ y="526.93378">... print("Do not copy!")</tspan></text>
+ </g>
+ <g
+ transform="translate(-5.8120638,249.8915)"
+ id="g1535-7-0-3">
+ <g
+ transform="translate(-40,-1.2125188)"
+ id="g408-2-4-6">
+ <rect
+ y="513.73224"
+ x="180"
+ height="20.1085"
+ width="115.81207"
+ id="rect4803-6-9-1-2"
+ style="fill:#000000;stroke-width:5.1639781;stroke-miterlimit:4;stroke-dasharray:none"
+ ry="0" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+ x="144.13281"
+ y="526.93378"
+ id="text4462-7-0-7-1"><tspan
+ sodipodi:role="line"
+ id="tspan4460-5-5-9-2"
+ x="144.13281"
+ y="526.93378">loopCount++</tspan></text>
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ id="path4851-6-74-9"
+ d="m 196.68794,463.31583 v 30"
+ style="fill:none;stroke:#000000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-5)"
+ sodipodi:nodetypes="cc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4851-6-74-8"
+ d="m 196.68794,523.31583 v 30"
+ style="fill:none;stroke:#000000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-1)"
+ sodipodi:nodetypes="cc" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4851-6-74-5"
+ d="m 196.68794,578.31583 v 35"
+ style="fill:none;stroke:#000000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-7)"
+ sodipodi:nodetypes="cc" />
+ <path
+ sodipodi:nodetypes="cc"
+ style="fill:#008000;stroke:#008000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-2G)"
+ d="m 196.68794,663.31583 v 30"
+ id="path4851-6-74-91"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cc"
+ style="fill:#008000;stroke:#008000;stroke-width:2.89087248;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker11618-6-5-2G-3)"
+ d="m 196.68794,723.31583 v 30"
+ id="path4851-6-74-91-9"
+ inkscape:connector-curvature="0" />
</g>
<script
ns1:version="14.10-05142318"
diff --git a/Doc/Sd1/statements.xml b/Doc/Sd1/statements.xml
index c2227e927..b018e7fef 100644
--- a/Doc/Sd1/statements.xml
+++ b/Doc/Sd1/statements.xml
@@ -192,12 +192,12 @@
<colgroup width="45%"/>
<tr>
- <td valign="top"><programlisting language="java">double initialAmount = 320000.00;
+ <td valign="top"><programlisting language="java">double saving = 320.00;
-if (100000 <= initialAmount) {
+if (1000 <= saving) {
// Rich customer, 1,2% interest rate
System.out.println(
- "Interest:" + 1.2 * initialAmount / 100);
+ "Interest:" + 1.2 * saving / 100);
}
System.out.println("Done!");</programlisting></td>
@@ -209,8 +209,7 @@ System.out.println("Done!");</programlisting></td>
</tr>
<tr>
- <td><screen>Interest:3840.0
-Done!</screen></td>
+ <td><screen>Done!</screen></td>
</tr>
</informaltable>
</figure>
@@ -232,21 +231,21 @@ Done!</screen></td>
<colgroup width="63%"/>
<tr>
- <td valign="top"><programlisting language="java">double initialAmount = 420.00;
-...
-if (100000 <= initialAmount <co linkends="sd1_fig_ifElse-1"
+ <td valign="top"><programlisting language="java">double saving = 320.00;
+
+if (1000 <= saving <co linkends="sd1_fig_ifElse-1"
xml:id="sd1_fig_ifElse-1-co"/>) { <co
linkends="sd1_fig_ifElse-2" xml:id="sd1_fig_ifElse-2-co"/>
// Rich customer, 1,2% interest rate
System.out.println(
- "Interest:" + 1.2 * initialAmount / 100);
+ "Interest:" + 1.2 * saving / 100);
} <co linkends="sd1_fig_ifElse-3" xml:id="sd1_fig_ifElse-3-co"/> else { <co
linkends="sd1_fig_ifElse-4" xml:id="sd1_fig_ifElse-4-co"/>
// Joe customer, 0.8% standard interest rate
System.out.println(
- "Interest:" + 0.8 * initialAmount / 100);
+ "Interest:" + 0.8 * saving / 100);
}
-System.out.println("Done!");</programlisting><screen>Interest:3.36
+System.out.println("Done!");</programlisting><screen>Interest:2.56
Done!</screen></td>
<td valign="top"><mediaobject>
--
GitLab