aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/Kinematics.md41
-rw-r--r--docs/img/corner-blob.jpgbin5772 -> 4665 bytes
-rw-r--r--docs/img/corner-dimple.jpgbin5507 -> 4388 bytes
-rw-r--r--docs/img/corner-good.jpgbin5461 -> 4354 bytes
-rw-r--r--docs/img/corner.svg42
-rw-r--r--docs/img/corner.svg.pngbin1176 -> 2157 bytes
-rw-r--r--docs/img/lookahead-slow.svg208
-rw-r--r--docs/img/lookahead-slow.svg.pngbin0 -> 7641 bytes
-rw-r--r--docs/img/lookahead.svg36
-rw-r--r--docs/img/lookahead.svg.pngbin3323 -> 4180 bytes
-rw-r--r--docs/img/trapezoids.svg25
-rw-r--r--docs/img/trapezoids.svg.pngbin4748 -> 4613 bytes
12 files changed, 304 insertions, 48 deletions
diff --git a/docs/Kinematics.md b/docs/Kinematics.md
index 92de88ad..401554f8 100644
--- a/docs/Kinematics.md
+++ b/docs/Kinematics.md
@@ -73,21 +73,24 @@ flow would result in poor print quality.
To solve this, the "look-ahead" mechanism queues multiple incoming
moves and analyzes the angles between moves to determine a reasonable
speed that can be obtained during the "junction" between two moves. If
-the next move forms an acute angle (the head is going to travel in
-nearly a reverse direction on the next move) then only a small
-junction speed is permitted. If the next move is nearly in the same
-direction then the head need only slow down a little (if at all).
+the next move is nearly in the same direction then the head need only
+slow down a little (if at all).
![lookahead](img/lookahead.svg.png)
+If the next move forms an acute angle (the head is going to travel in
+nearly a reverse direction on the next move) then only a small
+junction speed is permitted.
+
+![lookahead](img/lookahead-slow.svg.png)
+
The junction speeds are determined using "approximated centripetal
acceleration". Best
-[described](https://onehossshay.wordpress.com/2011/09/24/improving_grbl_cornering_algorithm/)
-by the author.
+[described by the author](https://onehossshay.wordpress.com/2011/09/24/improving_grbl_cornering_algorithm/).
Klipper implements look-ahead between moves contained in the XY plane
-that have similar extruder flow rates. Other moves are rare and
-implementing look-ahead between them is unnecessary.
+that have similar extruder flow rates. Other moves are relatively rare
+and implementing look-ahead between them is unnecessary.
Key formula for look-ahead:
```
@@ -158,20 +161,20 @@ To generate step times on Delta printers it is necessary to correlate
the movement in cartesian space with the movement on each stepper
tower.
+To simplify the math, for each stepper tower, the code calculates the
+location of a "virtual tower" that is along the line of movement.
+This virtual tower is chosen at the point where the line of movement
+(extended infinitely in both directions) would be closest to the
+actual tower.
+
![delta-tower](img/delta-tower.svg.png)
-To simplify the math, for each move contained in an XY plane, the code
-calculates the location of a "virtual tower" that is along the line of
-movement. This virtual tower is chosen at the point where the line of
-movement (extended infinitely in both directions) would be closest to
-the actual tower.
+It is then possible to calculate where the head will be along the line
+of movement after each step is taken on the virtual tower.
![virtual-tower](img/virtual-tower.svg.png)
-It is then possible to calculate where the head will be along the line
-of movement after each step is taken on the virtual tower. The key
-formula is Pythagoras's theorem:
-
+The key formula is Pythagoras's theorem:
```
distance_to_tower^2 = arm_length^2 - tower_height^2
```
@@ -196,7 +199,7 @@ must also be used in the calculations.
Should the move contain only Z movement (ie, no XY movement at all)
then the same math is used - just in this case the tower is parallel
-to the line of movement (its slope is 1.0).
+to the line of movement.
### Stepper motor acceleration limits ###
@@ -248,7 +251,7 @@ pressure. Pressure increases when filament is pushed into the extruder
(as in [Hooke's law](https://en.wikipedia.org/wiki/Hooke%27s_law)) and
the pressure necessary to extrude is dominated by the flow rate
through the nozzle orifice (as in
-[Poiseuille law](https://en.wikipedia.org/wiki/Poiseuille_law)). The
+[Poiseuille's law](https://en.wikipedia.org/wiki/Poiseuille_law)). The
key idea is that the relationship between filament, pressure, and flow
rate can be modeled using a linear coefficient:
```
diff --git a/docs/img/corner-blob.jpg b/docs/img/corner-blob.jpg
index 6dd529a0..eaf9024c 100644
--- a/docs/img/corner-blob.jpg
+++ b/docs/img/corner-blob.jpg
Binary files differ
diff --git a/docs/img/corner-dimple.jpg b/docs/img/corner-dimple.jpg
index 14cae0c4..55402d5e 100644
--- a/docs/img/corner-dimple.jpg
+++ b/docs/img/corner-dimple.jpg
Binary files differ
diff --git a/docs/img/corner-good.jpg b/docs/img/corner-good.jpg
index 687c73aa..812c82a5 100644
--- a/docs/img/corner-good.jpg
+++ b/docs/img/corner-good.jpg
Binary files differ
diff --git a/docs/img/corner.svg b/docs/img/corner.svg
index 3383a969..f2e3d0ef 100644
--- a/docs/img/corner.svg
+++ b/docs/img/corner.svg
@@ -102,8 +102,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.49"
- inkscape:cx="27.644"
- inkscape:cy="0.62950496"
+ inkscape:cx="95.030833"
+ inkscape:cy="-0.17370789"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@@ -112,11 +112,11 @@
fit-margin-right="0"
fit-margin-bottom="0"
showborder="false"
- inkscape:window-width="1920"
- inkscape:window-height="1032"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1">
+ inkscape:window-width="1068"
+ inkscape:window-height="478"
+ inkscape:window-x="378"
+ inkscape:window-y="113"
+ inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid6021"
@@ -133,7 +133,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>
@@ -154,5 +154,31 @@
id="path3514-5"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.25000095px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="189.09824"
+ y="482.48389"
+ id="text12656-9"
+ sodipodi:linespacing="125%"
+ transform="matrix(0.98759291,-0.15703579,0.15703579,0.98759291,0,0)"
+ inkscape:transform-center-x="1.3563414"
+ inkscape:transform-center-y="-5.7099754"><tspan
+ sodipodi:role="line"
+ id="tspan5552"
+ x="189.09824"
+ y="482.48389">move 1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.25000095px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="427.95532"
+ y="379.5321"
+ id="text12656-9-8"
+ sodipodi:linespacing="125%"
+ transform="matrix(0.98949457,0.14457001,-0.14457001,0.98949457,0,0)"><tspan
+ sodipodi:role="line"
+ id="tspan5554"
+ x="427.95532"
+ y="379.5321">move 2</tspan></text>
</g>
</svg>
diff --git a/docs/img/corner.svg.png b/docs/img/corner.svg.png
index c94ade20..12444e7c 100644
--- a/docs/img/corner.svg.png
+++ b/docs/img/corner.svg.png
Binary files differ
diff --git a/docs/img/lookahead-slow.svg b/docs/img/lookahead-slow.svg
new file mode 100644
index 00000000..fad4a6d9
--- /dev/null
+++ b/docs/img/lookahead-slow.svg
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ 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="97.22496mm"
+ height="32.550285mm"
+ viewBox="0 0 344.49789 115.33566"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="lookahead-slow.svg"
+ inkscape:export-filename="/home/kevin/src/reprap/firmware/klipper/docs/img/lookahead-slow.svg.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mend-1"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4329-1"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;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"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ id="path4329"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.15"
+ inkscape:cx="3.4198125"
+ inkscape:cy="101.26451"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1091"
+ inkscape:window-height="588"
+ inkscape:window-x="149"
+ inkscape:window-y="422"
+ inkscape:window-maximized="0"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ showborder="false"
+ inkscape:snap-global="false"
+ showguides="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3436" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-135.22429,-249.96955)">
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 150,250.23455 1.06383,102.12765 327.12765,-0.53192 -7.97871,5.85107"
+ id="path3347"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.5px;line-height:100%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="434.04257"
+ y="365.1282"
+ id="text3349"
+ sodipodi:linespacing="100%"><tspan
+ sodipodi:role="line"
+ id="tspan3351"
+ x="434.04257"
+ y="365.1282">time</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.5px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="-313.86618"
+ y="140.27856"
+ id="text3353"
+ sodipodi:linespacing="125%"
+ transform="matrix(-0.01601372,-0.99987177,0.99987177,-0.01601372,0,0)"><tspan
+ sodipodi:role="line"
+ id="tspan3355"
+ x="-313.86618"
+ y="140.27856">velocity</tspan></text>
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 150,250.23455 -5.31915,8.51063"
+ id="path3359"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.62366331px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 179.63013,351.45141 16.05677,-60.94328 43.25999,0 16.53759,47.11348"
+ id="path3361"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.7558428px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 254.72406,337.27551 22.65101,-77.77178 43.89917,0 24.69858,91.73948"
+ id="path3361-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.25000095px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="195.45749"
+ y="286.52051"
+ id="text12656-9"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan7078"
+ x="195.45749"
+ y="286.52051">move A</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.25000095px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="280.5639"
+ y="254.60564"
+ id="text12656-9-3"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan7080"
+ x="280.5639"
+ y="254.60564">move B</tspan></text>
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
+ d="m 74.333855,283.02668 -147.83244,52.19984"
+ id="path3514"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Mend-1)"
+ d="m -79.633985,251.6122 154.13499,31.81455"
+ id="path3514-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.25000095px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="36.7374"
+ y="252.31848"
+ id="text12656-9-1"
+ sodipodi:linespacing="125%"
+ transform="matrix(0.96753827,0.25272454,-0.25272454,0.96753827,0,0)"
+ inkscape:transform-center-x="-0.91382951"
+ inkscape:transform-center-y="-4.9145266"><tspan
+ sodipodi:role="line"
+ id="tspan7074"
+ x="36.7374"
+ y="252.31848">move A</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.25000095px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="-126.26086"
+ y="304.35226"
+ id="text12656-9-8"
+ sodipodi:linespacing="125%"
+ transform="matrix(0.93839918,-0.34555314,0.34555314,0.93839918,0,0)"><tspan
+ sodipodi:role="line"
+ id="tspan7076"
+ x="-126.26086"
+ y="304.35226">move B</tspan></text>
+ </g>
+</svg>
diff --git a/docs/img/lookahead-slow.svg.png b/docs/img/lookahead-slow.svg.png
new file mode 100644
index 00000000..80450e09
--- /dev/null
+++ b/docs/img/lookahead-slow.svg.png
Binary files differ
diff --git a/docs/img/lookahead.svg b/docs/img/lookahead.svg
index 4962a48a..b5c3df78 100644
--- a/docs/img/lookahead.svg
+++ b/docs/img/lookahead.svg
@@ -26,15 +26,15 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.94"
- inkscape:cx="294.7319"
+ inkscape:cx="116.54041"
inkscape:cy="45.708959"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1091"
inkscape:window-height="588"
- inkscape:window-x="107"
- inkscape:window-y="116"
+ inkscape:window-x="149"
+ inkscape:window-y="422"
inkscape:window-maximized="0"
fit-margin-top="0"
fit-margin-left="0"
@@ -55,7 +55,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>
@@ -110,11 +110,27 @@
id="path3361-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 262.35192,299.34775 0,54.25533"
- id="path3412"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.25000095px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="200.77664"
+ y="286.52051"
+ id="text12656-9"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan5532"
+ x="200.77664"
+ y="286.52051">move 1</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.25000095px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ x="280.5639"
+ y="255.66946"
+ id="text12656-9-3"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan5534"
+ x="280.5639"
+ y="255.66946">move 2</tspan></text>
</g>
</svg>
diff --git a/docs/img/lookahead.svg.png b/docs/img/lookahead.svg.png
index eb822746..b40e256c 100644
--- a/docs/img/lookahead.svg.png
+++ b/docs/img/lookahead.svg.png
Binary files differ
diff --git a/docs/img/trapezoids.svg b/docs/img/trapezoids.svg
index b4ff5faf..541309c4 100644
--- a/docs/img/trapezoids.svg
+++ b/docs/img/trapezoids.svg
@@ -25,9 +25,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="0.94"
- inkscape:cx="294.7319"
- inkscape:cy="45.708959"
+ inkscape:zoom="2.67"
+ inkscape:cx="164.48301"
+ inkscape:cy="76.011989"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -55,7 +55,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>
@@ -106,7 +106,7 @@
sodipodi:nodetypes="cccc" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.7558428px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 263.83557,321.45597 11.41184,-61.95224 59.85662,0 9.80496,28.97352"
+ d="m 263.83557,321.45597 11.41184,-61.95224 59.85662,0 9.80496,29.88826"
id="path3361-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
@@ -118,19 +118,22 @@
sodipodi:nodetypes="ccc" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 264.47958,319.56052 0,31.9149"
+ d="m 263.86975,321.69491 0.37453,30.52957"
id="path3412"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 343.73491,288.70946 1.06383,62.76596"
+ d="m 345.25947,289.31929 0.14909,62.46104"
id="path3414"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 222.45831,289.77329 1.06383,61.70213"
+ d="m 222.45831,289.77329 -0.0598,62.07666"
id="path3416"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:20.00000119px;line-height:125%;font-family:'DejaVu Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;-inkscape-font-specification:'DejaVu Sans, Normal';font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;"
diff --git a/docs/img/trapezoids.svg.png b/docs/img/trapezoids.svg.png
index 891a4715..b9f1090d 100644
--- a/docs/img/trapezoids.svg.png
+++ b/docs/img/trapezoids.svg.png
Binary files differ