diff --git a/Doc/Sd1/Ref/Fig/pascal.fig b/Doc/Sd1/Ref/Fig/pascal.fig
deleted file mode 100644
index e61ec986e69224f2d3bcc5b17140e42a31dbfe5d..0000000000000000000000000000000000000000
--- a/Doc/Sd1/Ref/Fig/pascal.fig
+++ /dev/null
@@ -1,92 +0,0 @@
-#FIG 3.2 Produced by xfig version 3.2.5c
-Landscape
-Center
-Metric
-A4
-100.00
-Single
--2
-1200 2
-2 4 0 0 7 0 600 -1 3 0.000 0 0 7 0 0 5
- 5805 3465 5805 3600 1080 3600 1080 3465 5805 3465
-2 4 0 0 7 0 600 -1 3 0.000 0 0 7 0 0 5
- 4860 2565 4860 2700 1980 2700 1980 2565 4860 2565
-2 3 0 0 7 0 600 -1 3 0.000 0 0 -1 0 0 5
- 4455 3735 5490 2700 5400 2610 4365 3645 4455 3735
-2 3 0 0 7 0 600 -1 3 0.000 0 0 -1 0 0 5
- 5355 3735 5940 3150 5850 3060 5265 3645 5355 3735
-2 4 0 0 7 0 600 -1 3 0.000 0 0 7 0 0 5
- 5310 3015 5310 3150 1530 3150 1530 3015 5310 3015
-2 3 0 0 7 0 600 -1 3 0.000 0 0 -1 0 0 5
- 3555 3735 5085 2205 4995 2115 3465 3645 3555 3735
-2 4 0 0 7 0 600 -1 3 0.000 0 0 7 0 0 5
- 4455 2115 4455 2250 2430 2250 2430 2115 4455 2115
-2 3 0 0 7 0 600 -1 3 0.000 0 0 -1 0 0 5
- 2655 3735 4590 1800 4500 1710 2565 3645 2655 3735
-2 4 0 0 7 0 600 -1 3 0.000 0 0 7 0 0 5
- 3915 1665 3915 1800 2880 1800 2880 1665 3915 1665
-2 3 0 0 7 0 600 -1 3 0.000 0 0 -1 0 0 5
- 1755 3735 4140 1350 4050 1260 1665 3645 1755 3735
-2 1 0 1 0 7 540 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 3262 2272 3532 2542
-2 1 0 1 0 7 540 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 4027 2272 3757 2542
-2 1 0 1 0 7 520 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 2811 2721 3081 2991
-2 1 0 1 0 7 520 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 3734 2744 4004 3014
-2 1 0 1 0 7 520 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 4477 2722 4207 2992
-2 1 0 1 0 7 520 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 3577 2722 3307 2992
-2 1 0 1 0 7 500 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 2361 3171 2631 3441
-2 1 0 1 0 7 500 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 3127 3172 2857 3442
-2 1 0 1 0 7 500 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 3261 3171 3531 3441
-2 1 0 1 0 7 500 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 4027 3172 3757 3442
-2 1 0 1 0 7 500 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 4161 3171 4431 3441
-2 1 0 1 0 7 500 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 1.00 60.00 120.00
- 4927 3172 4657 3442
-2 3 0 1 0 7 599 -1 -1 0.000 0 0 -1 0 0 4
- 1440 3825 3645 1620 5850 3825 1440 3825
-4 0 0 580 -1 30 12 0.0000 4 120 345 2925 1800 n=0\001
-4 0 0 580 -1 30 12 0.7854 4 150 345 3870 1620 k=0\001
-4 0 0 580 -1 30 12 0.0000 4 135 105 3600 1800 1\001
-4 0 0 560 -1 30 12 0.0000 4 135 105 3150 2250 1\001
-4 0 0 560 -1 30 12 0.0000 4 135 345 2475 2250 n=1\001
-4 0 0 560 -1 30 12 0.0000 4 135 105 4050 2250 1\001
-4 0 0 560 -1 30 12 0.7854 4 150 345 4320 2070 k=1\001
-4 0 0 540 -1 30 12 0.0000 4 120 345 2025 2700 n=2\001
-4 0 0 540 -1 30 12 0.0000 4 135 105 2700 2700 1\001
-4 0 0 540 -1 30 12 0.0000 4 120 105 3600 2700 2\001
-4 0 0 540 -1 30 12 0.0000 4 135 105 4500 2700 1\001
-4 0 0 540 -1 30 12 0.7854 4 150 345 4770 2475 k=2\001
-4 0 0 520 -1 30 12 0.0000 4 120 345 1575 3150 n=3\001
-4 0 0 520 -1 30 12 0.0000 4 135 105 2250 3150 1\001
-4 0 0 520 -1 30 12 0.7854 4 150 345 5220 2970 k=3\001
-4 0 0 520 -1 30 12 0.0000 4 135 105 4950 3150 1\001
-4 0 0 520 -1 30 12 0.0000 4 120 105 3150 3150 3\001
-4 0 0 500 -1 30 12 0.0000 4 135 345 1125 3600 n=4\001
-4 0 0 500 -1 30 12 0.0000 4 135 105 1800 3600 1\001
-4 0 0 500 -1 30 12 0.0000 4 135 105 2700 3600 4\001
-4 0 0 500 -1 30 12 0.0000 4 120 105 3600 3600 6\001
-4 0 0 500 -1 30 12 0.0000 4 135 105 4500 3600 4\001
-4 0 0 500 -1 30 12 0.7854 4 150 345 5670 3420 k=4\001
-4 0 0 520 -1 30 12 0.0000 4 120 105 4050 3150 3\001
-4 0 0 500 -1 30 12 0.0000 4 135 105 5400 3600 1\001
diff --git a/Doc/Sd1/Ref/Fig/pascal.svg b/Doc/Sd1/Ref/Fig/pascal.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9b7818bfd38b2c52c0f14d205f5733051bd393b4
--- /dev/null
+++ b/Doc/Sd1/Ref/Fig/pascal.svg
@@ -0,0 +1,753 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:jessyink="https://launchpad.net/jessyink"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ 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"
+ width="170mm"
+ height="75mm"
+ viewBox="0 0 170 75"
+ version="1.1"
+ id="svg13831"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="pascal.svg">
+ <defs
+ id="defs13825">
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Mend"
+ style="overflow:visible;"
+ inkscape:isstock="true">
+ <path
+ id="path1525"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ transform="scale(0.4) rotate(180) translate(10,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="TriangleOutL"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="TriangleOutL"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ id="path1658"
+ d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ transform="scale(0.8)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Lend"
+ style="overflow:visible;"
+ inkscape:isstock="true">
+ <path
+ id="path1537"
+ style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(1.1) rotate(180) translate(1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mend-9"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-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="Arrow1Mend-2"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-00"
+ 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="Arrow1Mend-3"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-9"
+ 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="Arrow1Mend-8"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-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="Arrow1Mend-7"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-31"
+ 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="Arrow1Mend-7-5"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-31-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="Arrow1Mend-7-5-1"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-31-0-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="Arrow1Mend-7-5-17"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-31-0-9"
+ 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="Arrow1Mend-7-5-0"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-31-0-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="Arrow1Mend-7-5-9"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-31-0-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="Arrow1Mend-7-5-4"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-31-0-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="Arrow1Mend-7-5-2"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1525-31-0-90"
+ 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>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="281.69592"
+ inkscape:cy="170.19926"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer2"
+ showgrid="true"
+ inkscape:window-width="3773"
+ inkscape:window-height="1997"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid14403"
+ units="mm"
+ spacingx="0.99999997"
+ spacingy="0.99999997"
+ empspacing="10" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata13828">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="L200">
+ <rect
+ style="fill:#00ffff;stroke:none;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect1301"
+ width="73.53904"
+ height="5.2099051"
+ x="-11.353791"
+ y="63.632473"
+ transform="rotate(-45.036088)" />
+ <rect
+ style="fill:#00ffff;stroke:none;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect1301-2"
+ width="60.8111"
+ height="5.2018881"
+ x="1.3652205"
+ y="77.782616"
+ transform="rotate(-45.036088)" />
+ <rect
+ style="fill:#00ffff;stroke:none;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect1301-24"
+ width="46.669037"
+ height="5.1929798"
+ x="15.498446"
+ y="91.933662"
+ transform="rotate(-45.036088)" />
+ <rect
+ style="fill:#00ffff;stroke:none;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect1301-7"
+ width="32.526905"
+ height="5.184073"
+ x="29.63167"
+ y="106.0847"
+ transform="rotate(-45.036088)" />
+ <rect
+ style="fill:#00ffff;stroke:none;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect1301-3"
+ width="18.384771"
+ height="5.1876354"
+ x="43.764893"
+ y="120.23574"
+ transform="rotate(-45.036088)" />
+ <rect
+ style="fill:#ffff00;stroke:none;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect1386"
+ width="107"
+ height="4.999999"
+ x="21"
+ y="51" />
+ <rect
+ style="fill:#ffff00;stroke:none;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect1386-2"
+ width="87"
+ height="5"
+ x="31"
+ y="41" />
+ <rect
+ style="fill:#ffff00;stroke:none;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect1386-0"
+ width="67"
+ height="5"
+ x="41"
+ y="31.000002" />
+ <rect
+ style="fill:#ffff00;stroke:none;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect1386-3"
+ width="47"
+ height="4.9999995"
+ x="50.999996"
+ y="21.000002" />
+ <rect
+ style="fill:#ffff00;stroke:none;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect1386-1"
+ width="27"
+ height="5"
+ x="60.999996"
+ y="11.000002" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="78.690781"
+ y="15.253707"
+ id="text430"><tspan
+ sodipodi:role="line"
+ id="tspan428"
+ x="78.690781"
+ y="15.253707"
+ style="stroke-width:0.26458332">1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="68.62738"
+ y="24.976484"
+ id="text434"><tspan
+ sodipodi:role="line"
+ id="tspan432"
+ x="68.62738"
+ y="24.976484"
+ style="stroke-width:0.26458332">1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="58.592926"
+ y="35.067619"
+ id="text438"><tspan
+ sodipodi:role="line"
+ id="tspan436"
+ x="58.592926"
+ y="35.067619"
+ style="stroke-width:0.26458332">1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="48.571095"
+ y="45.18301"
+ id="text442"><tspan
+ sodipodi:role="line"
+ id="tspan440"
+ x="48.571095"
+ y="45.18301"
+ style="stroke-width:0.26458332">1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="38.718616"
+ y="55.178326"
+ id="text446"><tspan
+ sodipodi:role="line"
+ id="tspan444"
+ x="38.718616"
+ y="55.178326"
+ style="stroke-width:0.26458332">1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="88.58709"
+ y="25.12188"
+ id="text450"><tspan
+ sodipodi:role="line"
+ id="tspan448"
+ x="88.58709"
+ y="25.12188"
+ style="stroke-width:0.26458332">1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="98.621544"
+ y="35.214821"
+ id="text454"><tspan
+ sodipodi:role="line"
+ id="tspan452"
+ x="98.621544"
+ y="35.214821"
+ style="stroke-width:0.26458332">1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="118.82845"
+ y="55.093262"
+ id="text458"><tspan
+ sodipodi:role="line"
+ id="tspan456"
+ x="118.82845"
+ y="55.093262"
+ style="stroke-width:0.26458332">1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="108.60907"
+ y="45.013432"
+ id="text462"><tspan
+ sodipodi:role="line"
+ id="tspan460"
+ x="108.60907"
+ y="45.013432"
+ style="stroke-width:0.26458332">1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="78.866074"
+ y="35.141743"
+ id="text466"><tspan
+ sodipodi:role="line"
+ id="tspan464"
+ x="78.866074"
+ y="35.141743"
+ style="stroke-width:0.26458332">2</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="68.677086"
+ y="45.188988"
+ id="text470"><tspan
+ sodipodi:role="line"
+ id="tspan468"
+ x="68.677086"
+ y="45.188988"
+ style="stroke-width:0.26458332">3</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="88.677086"
+ y="44.905506"
+ id="text474"><tspan
+ sodipodi:role="line"
+ id="tspan472"
+ x="88.677086"
+ y="44.905506"
+ style="stroke-width:0.26458332">3</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="58.724331"
+ y="55.047249"
+ id="text478"><tspan
+ sodipodi:role="line"
+ id="tspan476"
+ x="58.724331"
+ y="55.047249"
+ style="stroke-width:0.26458332">4</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="78.582588"
+ y="55.236237"
+ id="text482"><tspan
+ sodipodi:role="line"
+ id="tspan480"
+ x="78.582588"
+ y="55.236237"
+ style="stroke-width:0.26458332">6</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="98.393593"
+ y="55"
+ id="text486"><tspan
+ sodipodi:role="line"
+ id="tspan484"
+ x="98.393593"
+ y="55"
+ style="stroke-width:0.26458332">4</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="52.897125"
+ y="67.539017"
+ id="text424"
+ transform="rotate(-45.028725)"><tspan
+ sodipodi:role="line"
+ id="tspan422"
+ x="52.897125"
+ y="67.539017"
+ style="stroke-width:0.26458332">k=0</tspan><tspan
+ sodipodi:role="line"
+ x="52.897125"
+ y="72.830681"
+ style="stroke-width:0.26458332"
+ id="tspan426" /></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="52.890038"
+ y="81.681152"
+ id="text424-1"
+ transform="rotate(-45.028725)"><tspan
+ sodipodi:role="line"
+ id="tspan422-7"
+ x="52.890038"
+ y="81.681152"
+ style="stroke-width:0.26458332">k=1</tspan><tspan
+ sodipodi:role="line"
+ x="52.890038"
+ y="86.972816"
+ style="stroke-width:0.26458332"
+ id="tspan426-2" /></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="52.882946"
+ y="95.82328"
+ id="text424-2"
+ transform="rotate(-45.028725)"><tspan
+ sodipodi:role="line"
+ id="tspan422-8"
+ x="52.882946"
+ y="95.82328"
+ style="stroke-width:0.26458332">k=2</tspan><tspan
+ sodipodi:role="line"
+ x="52.882946"
+ y="101.11494"
+ style="stroke-width:0.26458332"
+ id="tspan426-1" /></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="52.875858"
+ y="109.96542"
+ id="text424-8"
+ transform="rotate(-45.028725)"><tspan
+ sodipodi:role="line"
+ id="tspan422-6"
+ x="52.875858"
+ y="109.96542"
+ style="stroke-width:0.26458332">k=3</tspan><tspan
+ sodipodi:role="line"
+ x="52.875858"
+ y="115.25708"
+ style="stroke-width:0.26458332"
+ id="tspan426-3" /></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="52.868752"
+ y="124.12002"
+ id="text424-3"
+ transform="rotate(-45.028725)"><tspan
+ sodipodi:role="line"
+ id="tspan422-72"
+ x="52.868752"
+ y="124.12002"
+ style="stroke-width:0.26458332">k=4</tspan><tspan
+ sodipodi:role="line"
+ x="52.868752"
+ y="129.41168"
+ style="stroke-width:0.26458332"
+ id="tspan426-5" /></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="22.859375"
+ y="54.882072"
+ id="text420"><tspan
+ sodipodi:role="line"
+ id="tspan418"
+ x="22.859375"
+ y="54.882072"
+ style="stroke-width:0.26458332">n=4</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="32.859375"
+ y="44.882072"
+ id="text420-9"><tspan
+ sodipodi:role="line"
+ id="tspan418-80"
+ x="32.859375"
+ y="44.882072"
+ style="stroke-width:0.26458332">n=3</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;"
+ x="62.859371"
+ y="14.882074"
+ id="text420-6"><tspan
+ sodipodi:role="line"
+ id="tspan418-8"
+ x="62.859371"
+ y="14.882074"
+ style="fill:#000000;stroke-width:0.26458332;">n=0</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;"
+ x="52.859371"
+ y="24.882074"
+ id="text420-64"><tspan
+ sodipodi:role="line"
+ id="tspan418-0"
+ x="52.859371"
+ y="24.882074"
+ style="fill:#000000;stroke:none;stroke-width:0.26458332;">n=1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ x="42.859375"
+ y="34.882072"
+ id="text420-8"><tspan
+ sodipodi:role="line"
+ id="tspan418-5"
+ x="42.859375"
+ y="34.882072"
+ style="stroke-width:0.26458332">n=2</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
+ d="m 71.999998,25.000002 6,5.999999"
+ id="path1514"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-9)"
+ d="m 81.999998,35.000001 5.999999,6"
+ id="path1514-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-2)"
+ d="m 91.999997,45.000001 6,6"
+ id="path1514-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-3)"
+ d="m 61.999998,35.000001 5,5"
+ id="path1514-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-8)"
+ d="m 71.999998,45.000001 6,6"
+ id="path1514-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-7)"
+ d="m 51.999998,46.000001 6,6"
+ id="path1514-00"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-7-5)"
+ d="m 87.999997,26.000001 -5,5.000001"
+ id="path1514-00-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-7-5-1)"
+ d="m 97.999997,36.000001 -6,6"
+ id="path1514-00-3-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-7-5-17)"
+ d="m 108,45.000001 -6,6"
+ id="path1514-00-3-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-7-5-0)"
+ d="m 77.999998,36.000001 -6,6"
+ id="path1514-00-3-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-7-5-9)"
+ d="m 67.999998,46.000001 -5,5.000001"
+ id="path1514-00-3-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend-7-5-4)"
+ d="m 87.999997,46.000001 -5.999999,6"
+ id="path1514-00-3-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 28.999999,60 79.999998,9.000002 129,60"
+ id="path929"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ </g>
+ <g
+ jessyink:masterSlide="masterSlide"
+ inkscape:label="Master"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-222)" />
+</svg>
diff --git a/Doc/Sd1/Ref/ObjectsAndClasses/rectangleObjects.svg b/Doc/Sd1/Ref/ObjectsAndClasses/rectangleObjects.svg
index c7f676c4fb7004d2d99738f349f1b5123fb75e9b..6c3c700393dd555c85806e9ca2328f9a284bc593 100644
--- a/Doc/Sd1/Ref/ObjectsAndClasses/rectangleObjects.svg
+++ b/Doc/Sd1/Ref/ObjectsAndClasses/rectangleObjects.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="rectangleObjects.svg"
- inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
version="1.2"
id="svg2"
height="68.791664mm"
@@ -24,17 +24,17 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.2077062"
- inkscape:cx="304.36845"
- inkscape:cy="288.50034"
+ inkscape:zoom="2.4154124"
+ inkscape:cx="399.13917"
+ inkscape:cy="153.20908"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="true"
- inkscape:window-width="771"
- inkscape:window-height="450"
- inkscape:window-x="38"
- inkscape:window-y="65"
- inkscape:window-maximized="0"
+ inkscape:window-width="3367"
+ inkscape:window-height="1771"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
showguides="true"
inkscape:guide-bbox="true"
units="mm">
@@ -713,7 +713,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>
@@ -733,95 +733,87 @@
x="104.51711"
y="415.68225"
style="font-size:42.66666794px;line-height:1.25;font-family:sans-serif;stroke-width:1.06666672">Â </tspan></text>
- <g
- id="g1612"
- transform="translate(-590,330)">
- <rect
- ry="0"
- y="602.51971"
- x="650"
- height="140"
- width="100"
- id="rect1184"
- style="fill:none;stroke:#000000;stroke-width:3.87298346;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <text
- id="text1196"
- y="587.48059"
- x="613.74426"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
- xml:space="preserve"><tspan
- style="fill:#0000ff"
- y="587.48059"
- x="613.74426"
- id="tspan1194"
- sodipodi:role="line">width=20</tspan></text>
- <text
- id="text1200"
- y="676.87036"
- x="761.92798"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
- xml:space="preserve"><tspan
- style="fill:#008000"
- y="676.87036"
- x="761.92798"
- id="tspan1198"
- sodipodi:role="line">height=28</tspan></text>
- <text
- id="text1210"
- y="785.56354"
- x="602.00891"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
- xml:space="preserve"><tspan
- style="fill:#ff00ff"
- y="785.56354"
- x="602.00891"
- id="tspan1208"
- sodipodi:role="line">solid border</tspan></text>
- </g>
- <g
- id="g1603"
- transform="translate(400,250)">
- <rect
- y="682.51971"
- x="90"
- height="49.999992"
- width="140"
- id="rect1182"
- style="fill:none;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:18, 3;stroke-dashoffset:0;stroke-opacity:1" />
- <text
- id="text1188"
- y="717.76947"
- x="239.47336"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
- xml:space="preserve"><tspan
- style="fill:#008000"
- y="717.76947"
- x="239.47336"
- id="tspan1186"
- sodipodi:role="line">heigt=10</tspan></text>
- <text
- id="text1192"
- y="668.52173"
- x="69.829247"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
- xml:space="preserve"><tspan
- style="font-size:37.33333206px;fill:#0000ff"
- y="668.52173"
- x="69.829247"
- id="tspan1190"
- sodipodi:role="line">width=28</tspan></text>
- <text
- id="text1214"
- y="786.75623"
- x="55.54538"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
- xml:space="preserve"><tspan
- style="fill:#ff00ff"
- y="786.75623"
- x="55.54538"
- id="tspan1212"
- sodipodi:role="line">dashed border</tspan></text>
- </g>
+ <rect
+ style="fill:none;stroke:#000000;stroke-width:3.87298346;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect1184"
+ width="100"
+ height="140"
+ x="60"
+ y="927.95618"
+ ry="0" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ x="25.814302"
+ y="903.10492"
+ id="text1196"><tspan
+ sodipodi:role="line"
+ id="tspan1194"
+ x="25.814302"
+ y="903.10492"
+ style="fill:#0000ff">width=20</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ x="171.92798"
+ y="1006.8704"
+ id="text1200"><tspan
+ sodipodi:role="line"
+ id="tspan1198"
+ x="171.92798"
+ y="1006.8704"
+ style="fill:#008000">height=28</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ x="12.008911"
+ y="1115.5635"
+ id="text1210"><tspan
+ sodipodi:role="line"
+ id="tspan1208"
+ x="12.008911"
+ y="1115.5635"
+ style="fill:#ff00ff">solid border</tspan></text>
+ <rect
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:18, 3;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect1182"
+ width="140"
+ height="49.999992"
+ x="470"
+ y="927.51971" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ x="619.47339"
+ y="962.76947"
+ id="text1188"><tspan
+ sodipodi:role="line"
+ id="tspan1186"
+ x="619.47339"
+ y="962.76947"
+ style="fill:#008000">height=10</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ x="451.89929"
+ y="903.10492"
+ id="text1192"><tspan
+ sodipodi:role="line"
+ id="tspan1190"
+ x="451.89929"
+ y="903.10492"
+ style="font-size:37.33333206px;fill:#0000ff">width=28</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ x="435.54538"
+ y="1031.7562"
+ id="text1214"><tspan
+ sodipodi:role="line"
+ id="tspan1212"
+ x="435.54538"
+ y="1031.7562"
+ style="fill:#ff00ff">dashed border</tspan></text>
</g>
<script
ns1:version="14.10-05142318"
diff --git a/Doc/Sd1/arrays.xml b/Doc/Sd1/arrays.xml
index 32c85ea2d7b1a002e0aae576ac887e2c44fa0ba8..506273da332f5cfb0da409d579e4b5dc9d8839c3 100644
--- a/Doc/Sd1/arrays.xml
+++ b/Doc/Sd1/arrays.xml
@@ -1645,9 +1645,9 @@ final int[] sortedValues = Arrays.copyOf(values, values.length);
<para role="eclipse">P/Sd1/Array/integerStoreSkeleton</para>
</annotation>
- <para>Like in the previous exercise Junit tests are being
- prepared but masked by an <interfacename
- xlink:href="https://junit.org/junit5/docs/current/api/org/junit/jupiter/api/Disabled.html">@Disabled</interfacename>
+ <para>Like in the previous exercise <xref linkend="glo_Junit"/>
+ tests are being prepared but masked by a <interfacename
+ xlink:href="https://junit.org/junit5/docs/current/api/org.junit.jupiter.api/org/junit/jupiter/api/Disabled.html">@Disabled</interfacename>
annotation.</para>
<para>This skeleton project contains:</para>
@@ -1668,19 +1668,20 @@ final int[] sortedValues = Arrays.copyOf(values, values.length);
</listitem>
<listitem>
- <para>Like in the previous exercise the Junit tests are
- being masked by an <interfacename
- xlink:href="https://junit.org/junit5/docs/current/api/org/junit/jupiter/api/Disabled.html">@Disabled</interfacename>
- annotation. After successful implementation they should be
- enabled for test activation.</para>
+ <para>Like in the previous exercise the <xref
+ linkend="glo_Junit"/> tests are being masked by a
+ <interfacename
+ xlink:href="https://junit.org/junit5/docs/current/api/org.junit.jupiter.api/org/junit/jupiter/api/Disabled.html">@Disabled</interfacename>
+ annotation. After successful implementation its removal
+ allows for test execution.</para>
</listitem>
</itemizedlist>
</question>
<answer>
- <annotation role="make">
- <para role="eclipse">P/Sd1/Array/integerStore</para>
- </annotation>
+ <para>See <link
+ xlink:href="https://gitlab.mi.hdm-stuttgart.de/goik/GoikLectures/-/tree/master/P/Sd1/Array/integerStore">integer
+ store project</link>.</para>
</answer>
</qandaentry>
</qandadiv>
@@ -1699,7 +1700,8 @@ final int[] sortedValues = Arrays.copyOf(values, values.length);
<orderedlist>
<listitem>
- <para>Copy the completed project to a new one e.g. named
+ <para>Copy the completed project to a new one
+ <abbrev>e.g.</abbrev> named
<quote>UnboundedContainer</quote>. This way you still have
the bounded implementation available.</para>
</listitem>
diff --git a/Doc/Sd1/gettingStarted.xml b/Doc/Sd1/gettingStarted.xml
index b93835073b145704ac57f3c36fa1d35ad90659e4..fe08f1c8d5d18e8e2d368597c61459a3f1f51559 100644
--- a/Doc/Sd1/gettingStarted.xml
+++ b/Doc/Sd1/gettingStarted.xml
@@ -743,7 +743,7 @@
<listitem>
<para>Presenting <emphasis role="bold">at least three
exercise</emphasis> solutions of <uri
- xlink:href="https://freedocs.mi.hdm-stuttgart.de/webhelp/apb.html">https://freedocs.mi.hdm-stuttgart.de/webhelp/apb.html</uri>.</para>
+ xlink:href="https://freedocs.mi.hdm-stuttgart.de/apb.html">https://freedocs.mi.hdm-stuttgart.de/apb.html</uri>.</para>
<itemizedlist>
<listitem>
diff --git a/Doc/Sd1/objectsClasses.xml b/Doc/Sd1/objectsClasses.xml
index ccee9ba2150939523a0c96fa1950d57dfa5f5595..97e421324240258b5499d6a80b3473701971c71b 100644
--- a/Doc/Sd1/objectsClasses.xml
+++ b/Doc/Sd1/objectsClasses.xml
@@ -3632,7 +3632,7 @@ public class Driver {
<package>company.model</package>:</para>
<figure xml:id="sd1FigPackageHierarchy">
- <title> <classname>Employee</classname> example package
+ <title><classname>Employee</classname> example package
hierarchy</title>
<programlisting language="none"> Project root
@@ -3876,6 +3876,12 @@ public class String { <co linkends="sd1_callout_createStringClass-1.2"
this.s = s;
}
+ public java.lang.String toString() <co
+ linkends="sd1_qanda_defineStringClassImpl-4"
+ xml:id="sd1_qanda_defineStringClassImpl-4-co"/> {
+ return s;
+ }
+
public java.lang.String <co linkends="sd1_callout_createStringClass-4"
xml:id="sd1_callout_createStringClass-4-co"/> sayHello() {
return "Hello '" + s + "', good morning!";
@@ -3908,6 +3914,13 @@ public class String { <co linkends="sd1_callout_createStringClass-1.2"
instance.</para>
</callout>
+ <callout arearefs="sd1_qanda_defineStringClassImpl-4-co"
+ xml:id="sd1_qanda_defineStringClassImpl-4">
+ <para>This method will be called automatically when e.g
+ using <code language="java">System.out.println(s)</code> for
+ printing an instance <code>s</code>.</para>
+ </callout>
+
<callout arearefs="sd1_callout_createStringClass-4-co"
xml:id="sd1_callout_createStringClass-4">
<para>Returning a <package
@@ -3941,8 +3954,9 @@ public class Main {
linkends="sd1_callout_createStringAnswer1-1"
xml:id="sd1_callout_createStringAnswer1-1-co"/> [] args) {
String <co linkends="sd1_callout_createStringAnswer1-2"
- xml:id="sd1_callout_createStringAnswer1-2-co"/> s = new String("John");
- System.out.println(s.sayHello());
+ xml:id="sd1_callout_createStringAnswer1-2-co"/> john = new String("John");
+ System.out.println("Name: " + john);
+ System.out.println(john.sayHello());
}
}</programlisting>
@@ -3968,6 +3982,11 @@ public class Main {
<package>de.hdm_stuttgart.mi.sd1.tooling</package>.<classname>String</classname>:</glossterm>
<glossdef>
+ <para>Basically this variant is about mutually exchanging
+ <package>java.lang</package><code>.</code><classname>String</classname>
+ and
+ <package>de.hdm_stuttgart.mi.sd1.tooling</package><code>.</code><classname>String</classname>:</para>
+
<programlisting language="java">package de.hdm_stuttgart.mi;
public class Main {
@@ -3977,16 +3996,18 @@ public class Main {
xml:id="sd1_callout_createStringAnswer2-1-co"/> [] args) {
de.hdm_stuttgart.mi.sd1.tooling.String <co
linkends="sd1_callout_createStringAnswer2-2"
- xml:id="sd1_callout_createStringAnswer2-2-co"/> s =
+ xml:id="sd1_callout_createStringAnswer2-2-co"/> john =
new de.hdm_stuttgart.mi.sd1.tooling.String("John");
- System.out.println(s.sayHello());
+ System.out.println("Name: " + john);
+ System.out.println(john.sayHello());
}
}</programlisting>
<calloutlist>
<callout arearefs="sd1_callout_createStringAnswer2-1-co"
xml:id="sd1_callout_createStringAnswer2-1">
- <para>A <xref linkend="glo_Java"/> standard <classname
+ <para>A <xref linkend="glo_Java"/> standard
+ <package>java.lang</package>.<classname
xlink:href="https://docs.oracle.com/javase/10/docs/api/java/lang/String.html">String</classname>
instance.</para>
</callout>
@@ -7442,7 +7463,7 @@ System.out.println(factorial(3));</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/pascal.fig"/>
+ <imagedata fileref="Ref/Fig/pascal.svg"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/Doc/preface.xml b/Doc/preface.xml
index 6e634c894de46429a0196f373ea29e1949284b1f..c2c05066ff3b70c7b4aca5d6261e359f99ed880f 100644
--- a/Doc/preface.xml
+++ b/Doc/preface.xml
@@ -32,7 +32,7 @@
<listitem>
<para><link
- xlink:href="https://bb.mi.hdm-stuttgart.de/category/1/lectures">Post a
+ xlink:href="https://bb.mi.hdm-stuttgart.de/category/5/general">Post a
topic</link> in a related forum.</para>
</listitem>
</itemizedlist>