[dia] Assorted: optimize to combine fill and stroke in one element
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] Assorted: optimize to combine fill and stroke in one element
- Date: Thu, 1 May 2014 10:49:28 +0000 (UTC)
commit 4aad6da7502ade47817ba289b3e9650e913e097d
Author: Hans Breuer <hans breuer org>
Date: Sun Apr 27 11:31:02 2014 +0200
Assorted: optimize to combine fill and stroke in one element
still there are two elements rendered e.g. with SVG due to draw_polygon()
and draw_ellipse() not being optimized yet.
shapes/Assorted/arrow-chevron.shape | 5 +-
shapes/Assorted/arrow-down.shape | 5 +-
shapes/Assorted/arrow-left-notched.shape | 5 +-
shapes/Assorted/arrow-left-right-up.shape | 5 +-
shapes/Assorted/arrow-left-right.shape | 5 +-
shapes/Assorted/arrow-left-up.shape | 5 +-
shapes/Assorted/arrow-left.shape | 5 +-
shapes/Assorted/arrow-pentagon.shape | 5 +-
shapes/Assorted/arrow-quad.shape | 5 +-
shapes/Assorted/arrow-right-notched.shape | 5 +-
shapes/Assorted/arrow-right.shape | 5 +-
shapes/Assorted/arrow-turn-up.shape | 48 +-----------------------
shapes/Assorted/arrow-up-down-left.shape | 5 +-
shapes/Assorted/arrow-up-down.shape | 5 +-
shapes/Assorted/arrow-up.shape | 5 +-
shapes/Assorted/circle-quarter.shape | 3 +-
shapes/Assorted/circle.shape | 5 +-
shapes/Assorted/cross-maltese.shape | 5 +-
shapes/Assorted/cross-swiss.shape | 5 +-
shapes/Assorted/diamond.shape | 5 +-
shapes/Assorted/heart.shape | 3 +-
shapes/Assorted/heptagon.shape | 5 +-
shapes/Assorted/hexagon.shape | 5 +-
shapes/Assorted/moon-quarter.shape | 3 +-
shapes/Assorted/octagon.shape | 5 +-
shapes/Assorted/parallelogram-horizontal.shape | 5 +-
shapes/Assorted/parallelogram-vertical.shape | 5 +-
shapes/Assorted/pentagon.shape | 5 +-
shapes/Assorted/square.shape | 6 +-
shapes/Assorted/star4.shape | 5 +-
shapes/Assorted/star4curved.shape | 3 +-
shapes/Assorted/star5.shape | 5 +-
shapes/Assorted/star6.shape | 5 +-
shapes/Assorted/star7.shape | 5 +-
shapes/Assorted/star8.shape | 5 +-
shapes/Assorted/star8curved.shape | 3 +-
shapes/Assorted/star8sharp.shape | 5 +-
shapes/Assorted/sun.shape | 29 +++++---------
shapes/Assorted/trapezoid.shape | 5 +-
shapes/Assorted/triangle-rightangle.shape | 5 +-
40 files changed, 84 insertions(+), 174 deletions(-)
---
diff --git a/shapes/Assorted/arrow-chevron.shape b/shapes/Assorted/arrow-chevron.shape
index 7f3af01..e5a369f 100644
--- a/shapes/Assorted/arrow-chevron.shape
+++ b/shapes/Assorted/arrow-chevron.shape
@@ -26,11 +26,10 @@
<point x="2.5" y="1.5"/>
<point x="1" y="2"/>
<point x="0.5" y="1.5"/>
- <point x="1.40909090909091" y="1.04545454545455" main="yes"/>
+ <point x="1.40909090909091" y="1.04545454545455" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
- <svg:polygon style="stroke: foreground" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-down.shape b/shapes/Assorted/arrow-down.shape
index b49864e..d6245bb 100644
--- a/shapes/Assorted/arrow-down.shape
+++ b/shapes/Assorted/arrow-down.shape
@@ -30,11 +30,10 @@
<point x="3" y="3"/>
<point x="3.5" y="2"/>
<point x="3" y="1"/>
- <point x="2" y="1.84615384615385" main="yes"/>
+ <point x="2" y="1.84615384615385" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
- <svg:polygon style="stroke: foreground" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-left-notched.shape b/shapes/Assorted/arrow-left-notched.shape
index 63841d9..8fe2867 100644
--- a/shapes/Assorted/arrow-left-notched.shape
+++ b/shapes/Assorted/arrow-left-notched.shape
@@ -34,11 +34,10 @@
<point x="2" y="3.5"/>
<point x="3" y="3"/>
<point x="3.5" y="2.5"/>
- <point x="2.3" y="2.03333333333333" main="yes"/>
+ <point x="2.3" y="2.03333333333333" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
- <svg:polygon style="stroke: foreground" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-left-right-up.shape b/shapes/Assorted/arrow-left-right-up.shape
index ee35dd8..72087ef 100644
--- a/shapes/Assorted/arrow-left-right-up.shape
+++ b/shapes/Assorted/arrow-left-right-up.shape
@@ -70,11 +70,10 @@
<point x="8" y="6.5"/>
<point x="9" y="6"/>
<point x="9" y="4"/>
- <point x="4.90909090909091" y="3.89393939393939" main="yes"/>
+ <point x="4.90909090909091" y="3.89393939393939" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7
10,5 8,3 "/>
- <svg:polygon style="stroke: foreground" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6
8,7 10,5 8,3 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3
0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-left-right.shape b/shapes/Assorted/arrow-left-right.shape
index 244ef18..ea4f3a5 100644
--- a/shapes/Assorted/arrow-left-right.shape
+++ b/shapes/Assorted/arrow-left-right.shape
@@ -42,11 +42,10 @@
<point x="6" y="3.5"/>
<point x="7" y="3"/>
<point x="7" y="1"/>
- <point x="3.89473684210526" y="2.07894736842105" main="yes"/>
+ <point x="3.89473684210526" y="2.07894736842105" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/>
- <svg:polygon style="stroke: foreground" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 6,0
"/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-left-up.shape b/shapes/Assorted/arrow-left-up.shape
index add7e1f..9c89bc8 100644
--- a/shapes/Assorted/arrow-left-up.shape
+++ b/shapes/Assorted/arrow-left-up.shape
@@ -50,11 +50,10 @@
<point x="1" y="6"/>
<point x="2" y="6.5"/>
<point x="4" y="6"/>
- <point x="5" y="5" main="yes"/>
+ <point x="3.47826086956522" y="3.56521739130435" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: background" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: foreground" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5
2,7 2,6 6,6 "/>
+ <svg:polygon style="fill: background; stroke: foreground; stroke-width: 0.1; " points="6,2 7,2 5,0 3,2
4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-left.shape b/shapes/Assorted/arrow-left.shape
index a3d5142..b89c517 100644
--- a/shapes/Assorted/arrow-left.shape
+++ b/shapes/Assorted/arrow-left.shape
@@ -30,11 +30,10 @@
<point x="1" y="3"/>
<point x="2" y="3.5"/>
<point x="3" y="3"/>
- <point x="2.15384615384615" y="2" main="yes"/>
+ <point x="2.15384615384615" y="2" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
- <svg:polygon style="stroke: foreground" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-pentagon.shape b/shapes/Assorted/arrow-pentagon.shape
index 9997e47..675673d 100644
--- a/shapes/Assorted/arrow-pentagon.shape
+++ b/shapes/Assorted/arrow-pentagon.shape
@@ -22,11 +22,10 @@
<point x="2.5" y="0.5"/>
<point x="2.5" y="1.5"/>
<point x="1" y="2"/>
- <point x="1.55555555555556" y="1" main="yes"/>
+ <point x="1.55555555555556" y="1" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 "/>
- <svg:polygon style="stroke: foreground" points="0,0 2,0 3,1 2,2 0,2 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="0,0 2,0 3,1 2,2 0,2 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-quad.shape b/shapes/Assorted/arrow-quad.shape
index 67ca321..7f80962 100644
--- a/shapes/Assorted/arrow-quad.shape
+++ b/shapes/Assorted/arrow-quad.shape
@@ -51,11 +51,10 @@
<point x="8" y="7"/>
<point x="9" y="4"/>
<point x="9" y="6"/>
- <point x="4.93617021276596" y="5.03191489361702" main="yes"/>
+ <point x="4.93617021276596" y="5.03191489361702" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8
3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
- <svg:polygon style="stroke: foreground" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6
4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3
0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-right-notched.shape b/shapes/Assorted/arrow-right-notched.shape
index c1d1512..d250d6c 100644
--- a/shapes/Assorted/arrow-right-notched.shape
+++ b/shapes/Assorted/arrow-right-notched.shape
@@ -34,11 +34,10 @@
<point x="2" y="3.5"/>
<point x="1" y="3"/>
<point x="0.5" y="2.5"/>
- <point x="1.7" y="2.03333333333333" main="yes"/>
+ <point x="1.7" y="2.03333333333333" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/>
- <svg:polygon style="stroke: foreground" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2"/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-right.shape b/shapes/Assorted/arrow-right.shape
index fdc3da5..4a43b90 100644
--- a/shapes/Assorted/arrow-right.shape
+++ b/shapes/Assorted/arrow-right.shape
@@ -30,11 +30,10 @@
<point x="3" y="3"/>
<point x="2" y="3.5"/>
<point x="1" y="3"/>
- <point x="1.84615384615385" y="2" main="yes"/>
+ <point x="1.84615384615385" y="2" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
- <svg:polygon style="stroke: foreground" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-turn-up.shape b/shapes/Assorted/arrow-turn-up.shape
index 2fb92b5..f2c20fe 100644
--- a/shapes/Assorted/arrow-turn-up.shape
+++ b/shapes/Assorted/arrow-turn-up.shape
@@ -1,90 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"; xmlns:svg="http://www.w3.org/2000/svg";>
-
<!-- Author: Alan Horkan, 2002, mailto:horkana tcd ie -->
<!-- Author: Steffen Macke, 2003, mailto:sdteffen web de -->
-
<name>Assorted - Turn-Up Arrow</name>
-
<icon>arrow-turn-up.png</icon>
-
<connections>
-
<point x="6" y="2"/>
-
<point x="7" y="2"/>
-
<point x="5" y="0"/>
-
<point x="3" y="2"/>
-
<point x="4" y="2"/>
-
<point x="4" y="4"/>
-
<point x="2" y="4"/>
-
<point x="2" y="5"/>
-
<point x="2" y="6"/>
-
<point x="6" y="6"/>
-
<point x="6.5" y="2"/>
-
<point x="6" y="1"/>
-
<point x="4" y="1"/>
-
<point x="3.5" y="2"/>
-
<point x="4" y="3"/>
-
<point x="3" y="4"/>
-
<point x="4" y="6"/>
-
<point x="6" y="2"/>
-
<point x="7" y="2"/>
-
<point x="5" y="0"/>
-
<point x="3" y="2"/>
-
<point x="4" y="2"/>
-
<point x="4" y="4"/>
-
<point x="6" y="6"/>
-
<point x="6.5" y="2"/>
-
<point x="6" y="1"/>
-
<point x="4" y="1"/>
-
<point x="3.5" y="2"/>
-
<point x="4" y="3"/>
-
<point x="3" y="4"/>
-
<point x="4" y="6"/>
-
<point x="4.45161290322581" y="2.87096774193548" main="yes"/>
</connections>
-
<aspectratio type="fixed"/>
-
<svg:svg>
-
- <svg:polygon style="fill: background" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,6 6,6 "/>
-
- <svg:polygon style="stroke-width: 0.1; stroke: foreground" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,6 6,6
"/>
-
+ <svg:polygon style="fill: background; stroke-width: 0.1; stroke: foreground"
+ points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,6 6,6"/>
</svg:svg>
-
</shape>
-
diff --git a/shapes/Assorted/arrow-up-down-left.shape b/shapes/Assorted/arrow-up-down-left.shape
index 67d84ad..5d3c272 100644
--- a/shapes/Assorted/arrow-up-down-left.shape
+++ b/shapes/Assorted/arrow-up-down-left.shape
@@ -70,11 +70,10 @@
<point x="4" y="9"/>
<point x="6" y="9"/>
<point x="6.5" y="8"/>
- <point x="3.81818181818182" y="5" main="yes"/>
+ <point x="3.81818181818182" y="5" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10
7,8 6,8 "/>
- <svg:polygon style="stroke: foreground" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8
5,10 7,8 6,8 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7
2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-up-down.shape b/shapes/Assorted/arrow-up-down.shape
index 7829de3..065f19e 100644
--- a/shapes/Assorted/arrow-up-down.shape
+++ b/shapes/Assorted/arrow-up-down.shape
@@ -42,11 +42,10 @@
<point x="3.5" y="6"/>
<point x="3" y="7"/>
<point x="1" y="7"/>
- <point x="2.07894736842105" y="3.89473684210526" main="yes"/>
+ <point x="2.07894736842105" y="3.89473684210526" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/>
- <svg:polygon style="stroke: foreground" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 0,6
"/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/arrow-up.shape b/shapes/Assorted/arrow-up.shape
index 992f172..95902ef 100644
--- a/shapes/Assorted/arrow-up.shape
+++ b/shapes/Assorted/arrow-up.shape
@@ -30,11 +30,10 @@
<point x="3" y="1"/>
<point x="3.5" y="2"/>
<point x="3" y="3"/>
- <point x="2" y="2.15384615384615" main="yes"/>
+ <point x="2" y="2.15384615384615" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
- <svg:polygon style="stroke: foreground" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/circle-quarter.shape b/shapes/Assorted/circle-quarter.shape
index 05f0353..b0678f1 100644
--- a/shapes/Assorted/circle-quarter.shape
+++ b/shapes/Assorted/circle-quarter.shape
@@ -6,7 +6,6 @@
<connections/>
<aspectratio type="free"/>
<svg:svg>
- <svg:path style="fill: default" d="M 0 0 C 0.5,0 1,0.5 1,1 C 1,1 0,1 0,1 C 0,1 0,0 0,0z"/>
- <svg:path style="stroke: foreground" d="M 0 0 C 0.5,0 1,0.5 1,1 C 1,1 0,1 0,1 C 0,1 0,0 0,0"/>
+ <svg:path style="fill: default; stroke: foreground" d="M 0 0 C 0.5,0 1,0.5 1,1 C 1,1 0,1 0,1 C 0,1 0,0
0,0z"/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/circle.shape b/shapes/Assorted/circle.shape
index 1632525..acb23e0 100644
--- a/shapes/Assorted/circle.shape
+++ b/shapes/Assorted/circle.shape
@@ -12,11 +12,10 @@
<point x="1.5" y="1"/>
<point x="0.5" y="2"/>
<point x="2.5" y="2"/>
- <point x="1.5" y="2" main="yes"/>
+ <point x="1.5" y="2" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:ellipse style="fill: default" cx="1.5" cy="2" rx="1" ry="1"/>
- <svg:ellipse style="stroke: foreground" cx="1.5" cy="2" rx="1" ry="1"/>
+ <svg:ellipse style="fill: default; stroke: foreground" cx="1.5" cy="2" rx="1" ry="1"/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/cross-maltese.shape b/shapes/Assorted/cross-maltese.shape
index 6839134..a1e0f7c 100644
--- a/shapes/Assorted/cross-maltese.shape
+++ b/shapes/Assorted/cross-maltese.shape
@@ -35,11 +35,10 @@
<point x="9.5" y="6.75"/>
<point x="8.5" y="6.75"/>
<point x="8.5" y="6"/>
- <point x="9.03225806451613" y="4.98387096774194" main="yes"/>
+ <point x="9.03225806451613" y="4.98387096774194" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5
10,7 9,6.5 8,7 9,5 "/>
- <svg:polygon style="stroke: foreground" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6
9,5 10,7 9,6.5 8,7 9,5 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 11,4
10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/cross-swiss.shape b/shapes/Assorted/cross-swiss.shape
index 63c6f12..311c310 100644
--- a/shapes/Assorted/cross-swiss.shape
+++ b/shapes/Assorted/cross-swiss.shape
@@ -53,11 +53,10 @@
<point x="3.55" y="3.3"/>
<point x="3.3" y="3.55"/>
<point x="3.05" y="3.3"/>
- <point x="3.32173913043478" y="2.78913043478261" main="yes"/>
+ <point x="3.32173913043478" y="2.78913043478261" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55
4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/>
- <svg:polygon style="stroke: foreground" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05
3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="2.55,3.05 2.55,2.55 3.05,2.55 3.05,2.05
3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 3.05,3.05"/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/diamond.shape b/shapes/Assorted/diamond.shape
index 519d558..f9fa578 100644
--- a/shapes/Assorted/diamond.shape
+++ b/shapes/Assorted/diamond.shape
@@ -12,11 +12,10 @@
<point x="1" y="0"/>
<point x="1" y="2"/>
<point x="2" y="1"/>
- <point x="1" y="1" main="yes"/>
+ <point x="1" y="1" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="1,0 2,1 1,2 0,1 "/>
- <svg:polygon style="stroke: foreground" points="1,0 2,1 1,2 0,1 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="1,0 2,1 1,2 0,1 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/heart.shape b/shapes/Assorted/heart.shape
index c0fcd3e..caf039c 100644
--- a/shapes/Assorted/heart.shape
+++ b/shapes/Assorted/heart.shape
@@ -6,7 +6,6 @@
<connections/>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:path style="fill: default" d="M 9 9 C 5,4 13,2 13,8 C 13,8 13,8 13,8 C 13,2 21,4 17,9 C 17,9 13,14
13,14 C 13,14 9,9 9,9z"/>
- <svg:path style="stroke: foreground" d="M 9 9 C 5,4 13,2 13,8 C 13,8 13,8 13,8 C 13,2 21,4 17,9 C 17,9
13,14 13,14 C 13,14 9,9 9,9"/>
+ <svg:path style="fill: default; stroke: foreground" d="M 9 9 C 5,4 13,2 13,8 C 13,8 13,8 13,8 C 13,2
21,4 17,9 C 17,9 13,14 13,14 C 13,14 9,9 9,9z"/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/heptagon.shape b/shapes/Assorted/heptagon.shape
index cef9c3f..de60fb4 100644
--- a/shapes/Assorted/heptagon.shape
+++ b/shapes/Assorted/heptagon.shape
@@ -30,11 +30,10 @@
<point x="9.75" y="4"/>
<point x="8.75" y="7.75"/>
<point x="5" y="9.5"/>
- <point x="5.28846153846154" y="4.78846153846154" main="yes"/>
+ <point x="5.28846153846154" y="4.78846153846154" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: background" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 2.5,9.5 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: foreground" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5
2.5,9.5 "/>
+ <svg:polygon style="fill: background; stroke-width: 0.1; stroke: foreground" points="0,6 0.5,2 5,0 9.5,2
10,6 7.5,9.5 2.5,9.5 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/hexagon.shape b/shapes/Assorted/hexagon.shape
index 49b297d..1610690 100644
--- a/shapes/Assorted/hexagon.shape
+++ b/shapes/Assorted/hexagon.shape
@@ -26,11 +26,10 @@
<point x="3.5" y="3.25"/>
<point x="2.25" y="4"/>
<point x="1" y="3.25"/>
- <point x="2.36363636363636" y="2.56818181818182" main="yes"/>
+ <point x="2.36363636363636" y="2.56818181818182" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
- <svg:polygon style="stroke: foreground" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/moon-quarter.shape b/shapes/Assorted/moon-quarter.shape
index 08784f1..e1ed127 100644
--- a/shapes/Assorted/moon-quarter.shape
+++ b/shapes/Assorted/moon-quarter.shape
@@ -6,7 +6,6 @@
<aspectratio type="fixed"/>
<svg:svg>
- <svg:path style="fill: default" d="M 4 0 C 4,0 2,0 2,4 C 2,8 4,8 4,8 C 4,8 0,8 0,4 C 0,0 4,0 4,0z"/>
- <svg:path style="stroke: foreground" d="M 4 0 C 4,0 2,0 2,4 C 2,8 4,8 4,8 C 4,8 0,8 0,4 C 0,0 4,0 4,0"/>
+ <svg:path style="fill: default; stroke: foreground" d="M 4 0 C 4,0 2,0 2,4 C 2,8 4,8 4,8 C 4,8 0,8 0,4 C
0,0 4,0 4,0z"/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/octagon.shape b/shapes/Assorted/octagon.shape
index 92ff9a0..aa4114b 100644
--- a/shapes/Assorted/octagon.shape
+++ b/shapes/Assorted/octagon.shape
@@ -19,11 +19,10 @@
<point x="4.3" y="5.55"/>
<point x="3.05" y="5.05"/>
<point x="2.55" y="3.8"/>
- <point x="4.38333333333333" y="3.88333333333333" main="yes"/>
+ <point x="4.38333333333333" y="3.88333333333333" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55
2.55,4.55 2.55,3.05 "/>
- <svg:polygon style="stroke: foreground" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55
3.55,5.55 2.55,4.55 2.55,3.05 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="3.55,2.05 5.05,2.05 6.05,3.05 6.05,4.55
5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/parallelogram-horizontal.shape b/shapes/Assorted/parallelogram-horizontal.shape
index 30ecef9..81ac77d 100644
--- a/shapes/Assorted/parallelogram-horizontal.shape
+++ b/shapes/Assorted/parallelogram-horizontal.shape
@@ -18,11 +18,10 @@
<point x="1.5" y="0"/>
<point x="1.5" y="0.5"/>
<point x="0.5" y="1"/>
- <point x="1.07142857142857" y="0.5" main="yes"/>
+ <point x="1.07142857142857" y="0.5" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="1,0 2,0 1,1 0,1 "/>
- <svg:polygon style="stroke: foreground" points="1,0 2,0 1,1 0,1 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="1,0 2,0 1,1 0,1 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/parallelogram-vertical.shape b/shapes/Assorted/parallelogram-vertical.shape
index 32d0d39..1419bf8 100644
--- a/shapes/Assorted/parallelogram-vertical.shape
+++ b/shapes/Assorted/parallelogram-vertical.shape
@@ -18,11 +18,10 @@
<point x="0.5" y="0.5"/>
<point x="1" y="0.5"/>
<point x="0.5" y="1.5"/>
- <point x="0.571428571428571" y="0.928571428571429" main="yes"/>
+ <point x="0.571428571428571" y="0.928571428571429" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="0,1 1,0 1,1 0,2 "/>
- <svg:polygon style="stroke: foreground" points="0,1 1,0 1,1 0,2 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="0,1 1,0 1,1 0,2 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/pentagon.shape b/shapes/Assorted/pentagon.shape
index a222a92..93a0fbd 100644
--- a/shapes/Assorted/pentagon.shape
+++ b/shapes/Assorted/pentagon.shape
@@ -22,11 +22,10 @@
<point x="3" y="0.75"/>
<point x="3.5" y="2.5"/>
<point x="2" y="3.5"/>
- <point x="2.16666666666667" y="1.94444444444444" main="yes"/>
+ <point x="2.16666666666667" y="1.94444444444444" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
- <svg:polygon style="stroke: foreground" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/square.shape b/shapes/Assorted/square.shape
index eb40d73..25b8333 100644
--- a/shapes/Assorted/square.shape
+++ b/shapes/Assorted/square.shape
@@ -20,11 +20,11 @@
<point x="6" y="3.225"/>
<point x="5.25" y="4"/>
<point x="5.25" y="2.45"/>
- <point x="5.25" y="3.225" main="yes"/>
+ <point x="5.25" y="3.225" main="yes"/>
</connections>
+ <can-parent/>
<aspectratio type="fixed"/><!-- NB: Aspectration must be fixed, do not change it -->
<svg:svg>
- <svg:rect style="fill: default" x="4.5" y="2.45" width="1.5" height="1.55"/>
- <svg:rect style="stroke: foreground" x="4.5" y="2.45" width="1.5" height="1.55"/>
+ <svg:rect style="fill: default; stroke: foreground" x="4.5" y="2.45" width="1.5" height="1.55"/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/star4.shape b/shapes/Assorted/star4.shape
index 7de8845..2ab8c56 100644
--- a/shapes/Assorted/star4.shape
+++ b/shapes/Assorted/star4.shape
@@ -19,11 +19,10 @@
<point x="3.25" y="2.75"/>
<point x="2.25" y="3.75"/>
<point x="1.75" y="3.75"/>
- <point x="2.08333333333333" y="2.48333333333333" main="yes"/>
+ <point x="2.08333333333333" y="2.48333333333333" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/>
- <svg:polygon style="stroke: foreground" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 2,4.5
1.5,3 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/star4curved.shape b/shapes/Assorted/star4curved.shape
index cbe37cf..268f173 100644
--- a/shapes/Assorted/star4curved.shape
+++ b/shapes/Assorted/star4curved.shape
@@ -6,7 +6,6 @@
<aspectratio type="free"/>
<svg:svg>
- <svg:path style="fill: default" d="M 4.5 2 C 4.5,3 5.5,4 6.5,4 C 5.5,4 4.5,5 4.5,6 C 4.5,5 3.5,4 2.5,4 C
3.5,4 4.5,3 4.5,2z"/>
- <svg:path style="stroke: foreground" d="M 4.5 2 C 4.5,3 5.5,4 6.5,4 C 5.5,4 4.5,5 4.5,6 C 4.5,5 3.5,4
2.5,4 C 3.5,4 4.5,3 4.5,2"/>
+ <svg:path style="fill: default; stroke: foreground" d="M 4.5 2 C 4.5,3 5.5,4 6.5,4 C 5.5,4 4.5,5 4.5,6 C
4.5,5 3.5,4 2.5,4 C 3.5,4 4.5,3 4.5,2z"/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/star5.shape b/shapes/Assorted/star5.shape
index 69c418d..9236b69 100644
--- a/shapes/Assorted/star5.shape
+++ b/shapes/Assorted/star5.shape
@@ -43,12 +43,11 @@
<point x="9.5" y="10.75"/>
<point x="4.5" y="10.75"/>
<point x="3" y="10"/>
- <point x="7.26315789473684" y="6.73684210526316" main="yes"/>
+ <point x="7.26315789473684" y="6.73684210526316" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: background" points="0,4.5 5,4.5 7,0 9,4.5 14,4.5 10,7.5 12,12.5 7,9 2,12.5
4,7.5 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: foreground" points="0,4.5 5,4.5 7,0 9,4.5 14,4.5 10,7.5
12,12.5 7,9 2,12.5 4,7.5 "/>
+ <svg:polygon style="fill: background; stroke-width: 0.1; stroke: foreground" points="0,4.5 5,4.5 7,0
9,4.5 14,4.5 10,7.5 12,12.5 7,9 2,12.5 4,7.5 "/>
</svg:svg>
<!-- Alan Horkan was here 2002 -->
</shape>
diff --git a/shapes/Assorted/star6.shape b/shapes/Assorted/star6.shape
index 1819350..0ac0695 100644
--- a/shapes/Assorted/star6.shape
+++ b/shapes/Assorted/star6.shape
@@ -50,11 +50,10 @@
<point x="1.25" y="3.5"/>
<point x="0.5" y="3"/>
<point x="0.25" y="2.5"/>
- <point x="1.55434782608696" y="2.02173913043478" main="yes"/>
+ <point x="1.55434782608696" y="2.02173913043478" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/>
- <svg:polygon style="stroke: foreground" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2
"/>
+ <svg:polygon style="fill: default; stroke: foreground" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 1.5,4
1,3 0,3 0.5,2 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/star7.shape b/shapes/Assorted/star7.shape
index 459ce81..c946bec 100644
--- a/shapes/Assorted/star7.shape
+++ b/shapes/Assorted/star7.shape
@@ -59,11 +59,10 @@
<point x="0.75" y="5.5"/>
<point x="1.25" y="3.25"/>
<point x="2.25" y="2"/>
- <point x="5.02777777777778" y="5.22222222222222" main="yes"/>
+ <point x="5.02777777777778" y="5.22222222222222" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7
0,6.5 1.5,4.5 1,2 3.5,2 "/>
- <svg:polygon style="stroke: foreground" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7
0,6.5 1.5,4.5 1,2 3.5,2 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 7.5,9.5
5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/star8.shape b/shapes/Assorted/star8.shape
index 36a207c..e892bed 100644
--- a/shapes/Assorted/star8.shape
+++ b/shapes/Assorted/star8.shape
@@ -67,12 +67,11 @@
<point x="3" y="6.5"/>
<point x="1.75" y="6"/>
<point x="1" y="5.25"/>
- <point x="3.59677419354839" y="3.48387096774194" main="yes"/>
+ <point x="3.59677419354839" y="3.48387096774194" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<svg:svg>
- <svg:polygon style="fill: default" points="0,3.5 1,2.5 1,1 2.5,1 3.5,0 4.5,1 6,1 6,2.5 7,3.5 6,4.5 6,6
4.5,6 3.5,7 2.5,6 1,6 1,4.5 "/>
- <svg:polygon style="stroke: foreground" points="0,3.5 1,2.5 1,1 2.5,1 3.5,0 4.5,1 6,1 6,2.5 7,3.5 6,4.5
6,6 4.5,6 3.5,7 2.5,6 1,6 1,4.5 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="0,3.5 1,2.5 1,1 2.5,1 3.5,0 4.5,1 6,1
6,2.5 7,3.5 6,4.5 6,6 4.5,6 3.5,7 2.5,6 1,6 1,4.5"/>
</svg:svg>
<!-- Alan Horkan, 2002, horkana tcd ie -->
</shape>
diff --git a/shapes/Assorted/star8curved.shape b/shapes/Assorted/star8curved.shape
index 2ea8680..463bf09 100644
--- a/shapes/Assorted/star8curved.shape
+++ b/shapes/Assorted/star8curved.shape
@@ -6,7 +6,6 @@
<aspectratio type="fixed"/>
<svg:svg>
- <svg:path style="fill: default" d="M 2 0 C 2,1 3,1 3.5,0.5 C 3,1 3,2 4,2 C 3,2 3,3 3.5,3.5 C 3,3 2,3 2,4
C 2,3 1,3 0.5,3.5 C 1,3 1,2 0,2 C 1,2 1,1 0.5,0.5 C 1,1 2,1 2,0z"/>
- <svg:path style="stroke: foreground" d="M 2 0 C 2,1 3,1 3.5,0.5 C 3,1 3,2 4,2 C 3,2 3,3 3.5,3.5 C 3,3
2,3 2,4 C 2,3 1,3 0.5,3.5 C 1,3 1,2 0,2 C 1,2 1,1 0.5,0.5 C 1,1 2,1 2,0"/>
+ <svg:path style="fill: default; stroke: foreground" d="M 2 0 C 2,1 3,1 3.5,0.5 C 3,1 3,2 4,2 C 3,2 3,3
3.5,3.5 C 3,3 2,3 2,4 C 2,3 1,3 0.5,3.5 C 1,3 1,2 0,2 C 1,2 1,1 0.5,0.5 C 1,1 2,1 2,0z"/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/star8sharp.shape b/shapes/Assorted/star8sharp.shape
index 45bf593..0746b1b 100644
--- a/shapes/Assorted/star8sharp.shape
+++ b/shapes/Assorted/star8sharp.shape
@@ -67,12 +67,11 @@
<point x="7" y="12.5"/>
<point x="4.5" y="11.25"/>
<point x="3.75" y="10.5"/>
- <point x="7.66129032258065" y="7.48387096774194" main="yes"/>
+ <point x="7.66129032258065" y="7.48387096774194" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: default" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5
10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/>
- <svg:polygon style="stroke: foreground" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5
15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5
12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 5,8.5 "/>
</svg:svg>
</shape>
<!-- Author: Alan Horkan, 2002, mailto:horkana tcd ie -->
diff --git a/shapes/Assorted/sun.shape b/shapes/Assorted/sun.shape
index b586eff..7e24c75 100644
--- a/shapes/Assorted/sun.shape
+++ b/shapes/Assorted/sun.shape
@@ -92,30 +92,21 @@
<point x="1" y="6"/>
<point x="1.75" y="5.25"/>
<point x="1.25" y="5.5"/>
- <point x="3.5" y="3.51136363636364" main="yes"/>
+ <point x="3.5" y="3.51136363636364" main="yes"/>
</connections>
<aspectratio type="fixed"/>
<!-- I orignally used a nice warm gold colour #ffcc00, but shape files
have to use default if you want to allow the user to change the fill colour -->
<svg:svg>
- <svg:polygon style="fill: default" points="3.5,0 4,1 3,1 "/>
- <svg:polygon style="stroke: foreground" points="3.5,0 4,1 3,1 "/>
- <svg:ellipse style="fill: default" cx="3.5" cy="3.5" rx="2" ry="2"/>
- <svg:ellipse style="stroke: foreground" cx="3.5" cy="3.5" rx="2" ry="2"/>
- <svg:polygon style="fill: default" points="3.5,7 4,6 3,6 "/>
- <svg:polygon style="stroke: foreground" points="3.5,7 4,6 3,6 "/>
- <svg:polygon style="fill: default" points="-4.44089e-016,3.5 1,4 1,3 "/>
- <svg:polygon style="stroke: foreground" points="-4.44089e-016,3.5 1,4 1,3 "/>
- <svg:polygon style="fill: default" points="7,3.5 6,4 6,3 "/>
- <svg:polygon style="stroke: foreground" points="7,3.5 6,4 6,3 "/>
- <svg:polygon style="fill: default" points="2,1.5 1.5,2 1,1 "/>
- <svg:polygon style="stroke: foreground" points="2,1.5 1.5,2 1,1 "/>
- <svg:polygon style="fill: default" points="5.5,5 5,5.5 6,6 "/>
- <svg:polygon style="stroke: foreground" points="5.5,5 5,5.5 6,6 "/>
- <svg:polygon style="fill: default" points="5.5,2 5,1.5 6,1 "/>
- <svg:polygon style="stroke: foreground" points="5.5,2 5,1.5 6,1 "/>
- <svg:polygon style="fill: default" points="2,5.5 1.5,5 1,6 "/>
- <svg:polygon style="stroke: foreground" points="2,5.5 1.5,5 1,6 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="3.5,0 4,1 3,1 "/>
+ <svg:ellipse style="fill: default; stroke: foreground" cx="3.5" cy="3.5" rx="2" ry="2"/>
+ <svg:polygon style="fill: default; stroke: foreground" points="3.5,7 4,6 3,6 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="0,3.5 1,4 1,3 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="7,3.5 6,4 6,3 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="2,1.5 1.5,2 1,1 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="5.5,5 5,5.5 6,6 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="5.5,2 5,1.5 6,1 "/>
+ <svg:polygon style="fill: default; stroke: foreground" points="2,5.5 1.5,5 1,6 "/>
</svg:svg>
</shape>
<!-- Author: Alan Horkan, 2002, mailto:horkana tcd ie -->
diff --git a/shapes/Assorted/trapezoid.shape b/shapes/Assorted/trapezoid.shape
index 64bc290..09d58c6 100644
--- a/shapes/Assorted/trapezoid.shape
+++ b/shapes/Assorted/trapezoid.shape
@@ -12,11 +12,10 @@
<point x="0" y="2"/>
<point x="3.5" y="1"/>
<point x="0.5" y="1"/>
- <point x="2" y="1" main="yes"/>
+ <point x="2" y="1" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: background" points="1,0 3,0 4,2 0,2 "/>
- <svg:polygon style="stroke: foreground" points="1,0 3,0 4,2 0,2 "/>
+ <svg:polygon style="fill: background; stroke: foreground" points="1,0 3,0 4,2 0,2 "/>
</svg:svg>
</shape>
diff --git a/shapes/Assorted/triangle-rightangle.shape b/shapes/Assorted/triangle-rightangle.shape
index 03bed6d..4019440 100644
--- a/shapes/Assorted/triangle-rightangle.shape
+++ b/shapes/Assorted/triangle-rightangle.shape
@@ -12,12 +12,11 @@
<point x="1" y="2"/>
<point x="2" y="2"/>
- <point x="0.666666666666667" y="1.33333333333333" main="yes"/>
+ <point x="0.666666666666667" y="1.33333333333333" main="yes"/>
</connections>
<aspectratio type="free"/>
<svg:svg>
- <svg:polygon style="fill: background" points="0,2 2,2 0,0 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: foreground" points="0,2 2,2 0,0 "/>
+ <svg:polygon style="fill: background; stroke-width: 0.1; stroke: foreground" points="0,2 2,2 0,0 "/>
</svg:svg>
</shape>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
