dia r4099 - in trunk: . doc samples/Self shapes/Contact shapes/Electric shapes/Pneumatic



Author: hans
Date: Sat Jul 26 10:59:23 2008
New Revision: 4099
URL: http://svn.gnome.org/viewvc/dia?rev=4099&view=rev

Log:
2008-07-26  Hans Breuer  <hans breuer org>

	* doc-custom-shapes : shapes svg path can contain arc elements as well

	* doc/shape.dtd : fixed so that most of the shapes delivered with Dia
	pass 'xmllint --dtdvalid shape.dtd'. Remaining are some shapes having
	<svg:circle cx="0" r="1.5"/> e.g. place.shape:22: element circle: 
	validity error : Element circle does not carry attribute cy
	and the use of dublin core in some of Assorted
	* shape/(Contact|Electric|Pneumatic)/*.shape : remove the superfluous 
	'svg:' prefix from style attribute



Modified:
   trunk/ChangeLog
   trunk/doc/custom-shapes
   trunk/doc/shape.dtd
   trunk/samples/Self/dia-renderer.dia
   trunk/shapes/Contact/c_if.shape
   trunk/shapes/Contact/c_ifnot.shape
   trunk/shapes/Contact/c_lamp.shape
   trunk/shapes/Contact/c_relay.shape
   trunk/shapes/Contact/l_if.shape
   trunk/shapes/Contact/l_ifnot.shape
   trunk/shapes/Contact/l_out.shape
   trunk/shapes/Contact/l_outj.shape
   trunk/shapes/Contact/l_outnot.shape
   trunk/shapes/Contact/l_outr.shape
   trunk/shapes/Contact/l_outrcep.shape
   trunk/shapes/Contact/l_outs.shape
   trunk/shapes/Contact/l_sout.shape
   trunk/shapes/Contact/l_soutnot.shape
   trunk/shapes/Contact/l_soutr.shape
   trunk/shapes/Contact/l_souts.shape
   trunk/shapes/Electric/cnx.shape
   trunk/shapes/Electric/command.shape
   trunk/shapes/Electric/contact_f.shape
   trunk/shapes/Electric/contact_o.shape
   trunk/shapes/Electric/intpos_f.shape
   trunk/shapes/Electric/intpos_o.shape
   trunk/shapes/Electric/lamp.shape
   trunk/shapes/Electric/relay.shape
   trunk/shapes/Electric/vcommand.shape
   trunk/shapes/Electric/vcontact_f.shape
   trunk/shapes/Electric/vcontact_o.shape
   trunk/shapes/Electric/vintpos_f.shape
   trunk/shapes/Electric/vintpos_o.shape
   trunk/shapes/Electric/vlamp.shape
   trunk/shapes/Electric/vrelay.shape
   trunk/shapes/Pneumatic/cnx.shape
   trunk/shapes/Pneumatic/comelec1.shape
   trunk/shapes/Pneumatic/comelec2.shape
   trunk/shapes/Pneumatic/commusc.shape
   trunk/shapes/Pneumatic/compb.shape
   trunk/shapes/Pneumatic/compilh.shape
   trunk/shapes/Pneumatic/compilp.shape
   trunk/shapes/Pneumatic/compush.shape
   trunk/shapes/Pneumatic/comspr.shape
   trunk/shapes/Pneumatic/dejack.shape
   trunk/shapes/Pneumatic/dist22.shape
   trunk/shapes/Pneumatic/dist32.shape
   trunk/shapes/Pneumatic/dist42.shape
   trunk/shapes/Pneumatic/dist52.shape
   trunk/shapes/Pneumatic/drain.shape
   trunk/shapes/Pneumatic/press.shape
   trunk/shapes/Pneumatic/presshy.shape
   trunk/shapes/Pneumatic/presspn.shape
   trunk/shapes/Pneumatic/seijack.shape
   trunk/shapes/Pneumatic/seojack.shape

Modified: trunk/doc/custom-shapes
==============================================================================
--- trunk/doc/custom-shapes	(original)
+++ trunk/doc/custom-shapes	Sat Jul 26 10:59:23 2008
@@ -9,7 +9,7 @@
 The actual shape is described using a subset of the SVG
 specification.  The line, polyline, polygon, rect, circle, ellipse,
 path and g elements are supported.  Note that the path element only
-supports the M,m,L,l,H,h,V,v,C,c,S,s,Z and z commands.
+supports the M,m,L,l,H,h,V,v,C,c,A,a,S,s,Z and z commands.
 Transformations and CSS units are not supported (only `user' units
 are), and only a limited set of the CSS attributes are supported.
 

Modified: trunk/doc/shape.dtd
==============================================================================
--- trunk/doc/shape.dtd	(original)
+++ trunk/doc/shape.dtd	Sat Jul 26 10:59:23 2008
@@ -1,5 +1,5 @@
-<!ELEMENT shape (name, description*, icon?, connections?,
-		 aspectratio?, svg:svg) >
+<!ELEMENT shape (name|icon|description?|default-width?|default-height?|connections?|
+		 aspectratio?|textbox?|ext_attributes?|svg:svg)* >
 <!ATTLIST shape
   xmlns CDATA #FIXED 'http://www.daa.com.au/~james/dia-shape-ns'
   xmlns:svg CDATA #FIXED 'http://www.w3.org/2000/svg' >
@@ -9,7 +9,7 @@
 <!-- This element is deprecated.  Put descriptions in sheet files -->
 <!ELEMENT description (#PCDATA)* >
 <!ATTLIST description
-  xml:lang NMTOKEN #IMPLIED 'C' >
+  xml:lang NMTOKEN #IMPLIED >
 
 <!ELEMENT icon (#PCDATA)* >
 
@@ -27,6 +27,10 @@
   min CDATA #IMPLIED
   max CDATA #IMPLIED >
 
+<!ELEMENT default-width (#PCDATA)* >
+
+<!ELEMENT default-height (#PCDATA)* >
+
 <!ELEMENT textbox EMPTY >
 <!ATTLIST textbox
   x1 CDATA #REQUIRED
@@ -40,14 +44,16 @@
 <!ELEMENT ext_attribute EMPTY>
 <!ATTLIST ext_attribute
   name CDATA #REQUIRED
-  type CDATA #REQUIRED >
+  type CDATA #REQUIRED
+  description CDATA #IMPLIED >
 
 <!ELEMENT svg:svg (svg:g | svg:line | svg:polyline | svg:polygon | svg:rect |
                    svg:circle | svg:ellipse | svg:path | svg:text)* >
 <!ATTLIST svg:svg
   width CDATA #IMPLIED
   height CDATA #IMPLIED
-  style CDATA #IMPLIED >
+  style CDATA #IMPLIED 
+  viewBox CDATA #IMPLIED >
 
 <!ELEMENT svg:g (svg:g | svg:line | svg:polyline | svg:polygon | svg:rect | 
                  svg:circle | svg:ellipse | svg:path | svg:text )* >
@@ -65,12 +71,12 @@
 <!ELEMENT svg:polyline EMPTY >
 <!ATTLIST svg:polyline
   points CDATA #REQUIRED
-  stytle CDATA #IMPLIED >
+  style CDATA #IMPLIED >
 
 <!ELEMENT svg:polygon EMPTY >
 <!ATTLIST svg:polygon
   points CDATA #REQUIRED
-  stytle CDATA #IMPLIED >
+  style CDATA #IMPLIED >
 
 <!ELEMENT svg:rect EMPTY >
 <!ATTLIST svg:rect
@@ -106,4 +112,5 @@
 <!ELEMENT svg:path EMPTY >
 <!ATTLIST svg:path
   d CDATA #REQUIRED
-  style CDATA #IMPLIED >
+  style CDATA #IMPLIED
+  stroke-dasharray CDATA #IMPLIED >

Modified: trunk/samples/Self/dia-renderer.dia
==============================================================================
Binary files. No diff available.

Modified: trunk/shapes/Contact/c_if.shape
==============================================================================
--- trunk/shapes/Contact/c_if.shape	(original)
+++ trunk/shapes/Contact/c_if.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0"/>
     <svg:polyline points="-1,1 1,0 2,0 "/>
   </svg:svg>

Modified: trunk/shapes/Contact/c_ifnot.shape
==============================================================================
--- trunk/shapes/Contact/c_ifnot.shape	(original)
+++ trunk/shapes/Contact/c_ifnot.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0 -.75,-.875"/>
     <svg:polyline points="-1,-1 1,0 2,0 "/>
     <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" svg:style="stroke-width:.05"/>

Modified: trunk/shapes/Contact/c_lamp.shape
==============================================================================
--- trunk/shapes/Contact/c_lamp.shape	(original)
+++ trunk/shapes/Contact/c_lamp.shape	Sat Jul 26 10:59:23 2008
@@ -12,7 +12,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -1,0"/>
     <svg:polyline points="1,0 2,0"/>
     <svg:circle cx="0" cy="0" r="1"/>

Modified: trunk/shapes/Contact/c_relay.shape
==============================================================================
--- trunk/shapes/Contact/c_relay.shape	(original)
+++ trunk/shapes/Contact/c_relay.shape	Sat Jul 26 10:59:23 2008
@@ -14,7 +14,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -1,0"/>
     <svg:polyline points="1,0 2,0"/>
     <svg:rect x="-1" y="-1" width="2" height="2"/>

Modified: trunk/shapes/Contact/l_if.shape
==============================================================================
--- trunk/shapes/Contact/l_if.shape	(original)
+++ trunk/shapes/Contact/l_if.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:line x1="-2" y1="0" x2="-.25" y2="0"/>
     <svg:line x1="-.25" y1="-1" x2="-.25" y2="1"/>
     <svg:line x1="2" y1="0" x2=".25" y2="0"/>

Modified: trunk/shapes/Contact/l_ifnot.shape
==============================================================================
--- trunk/shapes/Contact/l_ifnot.shape	(original)
+++ trunk/shapes/Contact/l_ifnot.shape	Sat Jul 26 10:59:23 2008
@@ -13,12 +13,12 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:line x1="-2" y1="0" x2="-.25" y2="0"/>
     <svg:line x1="-.25" y1="-1" x2="-.25" y2="1"/>
     <svg:line x1="2" y1="0" x2=".25" y2="0"/>
     <svg:line x1=".25" y1="-1" x2=".25" y2="1"/>
     <svg:line x1="-1" y1="1" x2="1" y2="-1"/>
-    <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" svg:style="stroke-width:.05"/>
+    <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" style="stroke-width:.05"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Contact/l_out.shape
==============================================================================
--- trunk/shapes/Contact/l_out.shape	(original)
+++ trunk/shapes/Contact/l_out.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0"/>
     <svg:polyline points="2,0 .75,0"/>
     <svg:path d="M -.5,.75 C -.75,.5 -.75,.25 -.75,0        C -.75,-.25 -.75,-.5 -.5,-.75"/>

Modified: trunk/shapes/Contact/l_outj.shape
==============================================================================
--- trunk/shapes/Contact/l_outj.shape	(original)
+++ trunk/shapes/Contact/l_outj.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0"/>
     <svg:polyline points="2,0 .75,0"/>
     <svg:path d="M -.5,.75 C -.75,.5 -.75,.25 -.75,0        C -.75,-.25 -.75,-.5 -.5,-.75"/>

Modified: trunk/shapes/Contact/l_outnot.shape
==============================================================================
--- trunk/shapes/Contact/l_outnot.shape	(original)
+++ trunk/shapes/Contact/l_outnot.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0"/>
     <svg:polyline points="2,0 .75,0"/>
     <svg:path d="M -.5,.75 C -.75,.5 -.75,.25 -.75,0        C -.75,-.25 -.75,-.5 -.5,-.75"/>

Modified: trunk/shapes/Contact/l_outr.shape
==============================================================================
--- trunk/shapes/Contact/l_outr.shape	(original)
+++ trunk/shapes/Contact/l_outr.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0"/>
     <svg:polyline points="2,0 .75,0"/>
     <svg:path d="M -.5,.75 C -.75,.5 -.75,.25 -.75,0        C -.75,-.25 -.75,-.5 -.5,-.75"/>

Modified: trunk/shapes/Contact/l_outrcep.shape
==============================================================================
--- trunk/shapes/Contact/l_outrcep.shape	(original)
+++ trunk/shapes/Contact/l_outrcep.shape	Sat Jul 26 10:59:23 2008
@@ -12,7 +12,7 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0"/>
     <svg:polyline points="2,0 .75,0"/>
     <svg:path d="M -.5,.75 C -.75,.5 -.75,.25 -.75,0        C -.75,-.25 -.75,-.5 -.5,-.75"/>

Modified: trunk/shapes/Contact/l_outs.shape
==============================================================================
--- trunk/shapes/Contact/l_outs.shape	(original)
+++ trunk/shapes/Contact/l_outs.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0"/>
     <svg:polyline points="2,0 .75,0"/>
     <svg:path d="M -.5,.75 C -.75,.5 -.75,.25 -.75,0        C -.75,-.25 -.75,-.5 -.5,-.75"/>

Modified: trunk/shapes/Contact/l_sout.shape
==============================================================================
--- trunk/shapes/Contact/l_sout.shape	(original)
+++ trunk/shapes/Contact/l_sout.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0"/>
     <svg:polyline points="2,0 .75,0"/>
     <svg:path d="M -.5,.75 C -.75,.5 -.75,.25 -.75,0        C -.75,-.25 -.75,-.5 -.5,-.75"/>

Modified: trunk/shapes/Contact/l_soutnot.shape
==============================================================================
--- trunk/shapes/Contact/l_soutnot.shape	(original)
+++ trunk/shapes/Contact/l_soutnot.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0"/>
     <svg:polyline points="2,0 .75,0"/>
     <svg:path d="M -.5,.75 C -.75,.5 -.75,.25 -.75,0        C -.75,-.25 -.75,-.5 -.5,-.75"/>

Modified: trunk/shapes/Contact/l_soutr.shape
==============================================================================
--- trunk/shapes/Contact/l_soutr.shape	(original)
+++ trunk/shapes/Contact/l_soutr.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0"/>
     <svg:polyline points="2,0 .75,0"/>
     <svg:path d="M -.5,.75 C -.75,.5 -.75,.25 -.75,0        C -.75,-.25 -.75,-.5 -.5,-.75"/>

Modified: trunk/shapes/Contact/l_souts.shape
==============================================================================
--- trunk/shapes/Contact/l_souts.shape	(original)
+++ trunk/shapes/Contact/l_souts.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-4" y1="-2.4" x2="4" y2="-.7"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="4">
-    <svg:rect x="-2" y="-3" width="4" height="4" svg:style="stroke:none"/>
+    <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0"/>
     <svg:polyline points="2,0 .75,0"/>
     <svg:path d="M -.5,.75 C -.75,.5 -.75,.25 -.75,0        C -.75,-.25 -.75,-.5 -.5,-.75"/>

Modified: trunk/shapes/Electric/cnx.shape
==============================================================================
--- trunk/shapes/Electric/cnx.shape	(original)
+++ trunk/shapes/Electric/cnx.shape	Sat Jul 26 10:59:23 2008
@@ -10,7 +10,7 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
-    <svg:circle cx=".5" cy=".5" r=".05" svg:style="fill:foreground; stroke:none"/>	
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
+    <svg:circle cx=".5" cy=".5" r=".05" style="fill:foreground; stroke:none"/>	
   </svg:svg>
 </shape>

Modified: trunk/shapes/Electric/command.shape
==============================================================================
--- trunk/shapes/Electric/command.shape	(original)
+++ trunk/shapes/Electric/command.shape	Sat Jul 26 10:59:23 2008
@@ -14,8 +14,8 @@
   <textbox x1="-1" y1="-.8" x2="2" y2=".1"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1="0" y1=".5" x2="1" y2=".5"/>
-    <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/>
+    <svg:rect x=".3" y=".2" width=".4" height=".6" style="fill:background"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Electric/contact_f.shape
==============================================================================
--- trunk/shapes/Electric/contact_f.shape	(original)
+++ trunk/shapes/Electric/contact_f.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-1" y1="-.7" x2="2" y2=".2"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1="0" y1=".5" x2=".3" y2=".5"/>
     <svg:polyline points="0,.5 .3,.5 .3,.3"/>
     <svg:polyline points="1,.5 .7,.5 .25,.275"/>

Modified: trunk/shapes/Electric/contact_o.shape
==============================================================================
--- trunk/shapes/Electric/contact_o.shape	(original)
+++ trunk/shapes/Electric/contact_o.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-1" y1="-.5" x2="2" y2=".4"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1="0" y1=".5" x2=".3" y2=".5"/>
     <svg:polyline points="1,.5 .7,.5 .3,.7"/>
   </svg:svg>

Modified: trunk/shapes/Electric/intpos_f.shape
==============================================================================
--- trunk/shapes/Electric/intpos_f.shape	(original)
+++ trunk/shapes/Electric/intpos_f.shape	Sat Jul 26 10:59:23 2008
@@ -14,7 +14,7 @@
   <textbox x1="-1" y1="-.7" x2="2" y2=".2"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1="0" y1=".5" x2=".3" y2=".5"/>
     <svg:polyline points="0,.5 .3,.5 .3,.3"/>
     <svg:polyline points="1,.5 .7,.5 .25,.275"/>

Modified: trunk/shapes/Electric/intpos_o.shape
==============================================================================
--- trunk/shapes/Electric/intpos_o.shape	(original)
+++ trunk/shapes/Electric/intpos_o.shape	Sat Jul 26 10:59:23 2008
@@ -14,7 +14,7 @@
   <textbox x1="-1" y1="-.5" x2="2" y2=".4"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1="0" y1=".5" x2=".3" y2=".5"/>
     <svg:polyline points="1,.5 .7,.5 .3,.7"/>
     <svg:polyline points=".6,.55 .45,.75 .4,.65"/>

Modified: trunk/shapes/Electric/lamp.shape
==============================================================================
--- trunk/shapes/Electric/lamp.shape	(original)
+++ trunk/shapes/Electric/lamp.shape	Sat Jul 26 10:59:23 2008
@@ -12,9 +12,9 @@
   <textbox x1="-1" y1="-.7" x2="2" y2=".2"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1="0" y1=".5" x2="1" y2=".5"/>
-    <svg:circle cx=".5" cy=".5" r=".2" svg:style="fill:background"/>	
+    <svg:circle cx=".5" cy=".5" r=".2" style="fill:background"/>	
     <svg:line x1=".3586" y1=".3586" x2=".6414" y2=".6414"/>
     <svg:line x1=".3586" y1=".6414" x2=".6414" y2=".3586"/>
   </svg:svg>

Modified: trunk/shapes/Electric/relay.shape
==============================================================================
--- trunk/shapes/Electric/relay.shape	(original)
+++ trunk/shapes/Electric/relay.shape	Sat Jul 26 10:59:23 2008
@@ -14,9 +14,9 @@
   <textbox x1="-1" y1="-.8" x2="2" y2=".1"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1="0" y1=".5" x2="1" y2=".5"/>
-    <svg:rect x=".3" y=".2" width=".4" height=".6" svg:style="fill:background"/>
+    <svg:rect x=".3" y=".2" width=".4" height=".6" style="fill:background"/>
     <svg:line x1=".3" y1=".6" x2=".7" y2=".4"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Electric/vcommand.shape
==============================================================================
--- trunk/shapes/Electric/vcommand.shape	(original)
+++ trunk/shapes/Electric/vcommand.shape	Sat Jul 26 10:59:23 2008
@@ -14,8 +14,8 @@
   <textbox x1="-.8" y1="-1" x2=".1" y2="2"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1=".5" y1="0" x2=".5" y2="1"/>
-    <svg:rect x=".2" y=".3" width=".6" height=".4" svg:style="fill:background"/>
+    <svg:rect x=".2" y=".3" width=".6" height=".4" style="fill:background"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Electric/vcontact_f.shape
==============================================================================
--- trunk/shapes/Electric/vcontact_f.shape	(original)
+++ trunk/shapes/Electric/vcontact_f.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-.7" y1="-1" x2=".2" y2="2"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1=".5" y1="0" x2=".5" y2=".3"/>
     <svg:polyline points=".5,0 .5,.3 .3,.3"/>
     <svg:polyline points=".5,1 .5,.7 .275,.25"/>

Modified: trunk/shapes/Electric/vcontact_o.shape
==============================================================================
--- trunk/shapes/Electric/vcontact_o.shape	(original)
+++ trunk/shapes/Electric/vcontact_o.shape	Sat Jul 26 10:59:23 2008
@@ -13,7 +13,7 @@
   <textbox x1="-.5" y1="-1" x2=".4" y2="2"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1=".5" y1="0" x2=".5" y2=".3"/>
     <svg:polyline points=".5,1 .5,.7 .7,.3"/>
   </svg:svg>

Modified: trunk/shapes/Electric/vintpos_f.shape
==============================================================================
--- trunk/shapes/Electric/vintpos_f.shape	(original)
+++ trunk/shapes/Electric/vintpos_f.shape	Sat Jul 26 10:59:23 2008
@@ -14,7 +14,7 @@
   <textbox x1="-.7" y1="-1" x2=".2" y2="2"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1=".5" y1="0" x2=".5" y2=".3"/>
     <svg:polyline points=".5,0 .5,.3 .3,.3"/>
     <svg:polyline points=".5,1 .5,.7 .275,.25"/>

Modified: trunk/shapes/Electric/vintpos_o.shape
==============================================================================
--- trunk/shapes/Electric/vintpos_o.shape	(original)
+++ trunk/shapes/Electric/vintpos_o.shape	Sat Jul 26 10:59:23 2008
@@ -14,7 +14,7 @@
   <textbox x1="-.5" y1="-1" x2=".4" y2=".2"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1=".5" y1="0" x2=".5" y2=".3"/>
     <svg:polyline points=".5,1 .5,.7 .7,.3"/>
     <svg:polyline points=".55,.6 .75,.45 .65,.4"/>

Modified: trunk/shapes/Electric/vlamp.shape
==============================================================================
--- trunk/shapes/Electric/vlamp.shape	(original)
+++ trunk/shapes/Electric/vlamp.shape	Sat Jul 26 10:59:23 2008
@@ -12,9 +12,9 @@
   <textbox x1="-.7" y1="-1" x2=".2" y2="2"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1=".5" y1="0" x2=".5" y2="1"/>
-    <svg:circle cx=".5" cy=".5" r=".2" svg:style="fill:background"/>	
+    <svg:circle cx=".5" cy=".5" r=".2" style="fill:background"/>	
     <svg:line y1=".3586" x1=".3586" y2=".6414" x2=".6414"/>
     <svg:line y1=".3586" x1=".6414" y2=".6414" x2=".3586"/>
   </svg:svg>

Modified: trunk/shapes/Electric/vrelay.shape
==============================================================================
--- trunk/shapes/Electric/vrelay.shape	(original)
+++ trunk/shapes/Electric/vrelay.shape	Sat Jul 26 10:59:23 2008
@@ -14,9 +14,9 @@
   <textbox x1="-.8" y1="-1" x2=".1" y2="2"/>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
     <svg:line x1=".5" y1="0" x2=".5" y2="1"/>
-    <svg:rect x=".2" y=".3" width=".6" height=".4" svg:style="fill:background"/>
+    <svg:rect x=".2" y=".3" width=".6" height=".4" style="fill:background"/>
     <svg:line x1=".6" y1=".3" x2=".4" y2=".7"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/cnx.shape
==============================================================================
--- trunk/shapes/Pneumatic/cnx.shape	(original)
+++ trunk/shapes/Pneumatic/cnx.shape	Sat Jul 26 10:59:23 2008
@@ -9,8 +9,8 @@
   <point x="0.5" y="0.5" main="yes"/></connections>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
-    <svg:circle cx=".5" cy=".5" r=".05" svg:style="fill:foreground; stroke:none"/>	
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
+    <svg:circle cx=".5" cy=".5" r=".05" style="fill:foreground; stroke:none"/>	
   </svg:svg>
 
 </shape>

Modified: trunk/shapes/Pneumatic/comelec1.shape
==============================================================================
--- trunk/shapes/Pneumatic/comelec1.shape	(original)
+++ trunk/shapes/Pneumatic/comelec1.shape	Sat Jul 26 10:59:23 2008
@@ -11,8 +11,8 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
-    <svg:rect x="0" y=".3" width="1" height=".4" svg:style="stroke-width:1; fill:background"/>
-    <svg:line x1=".4" y1=".3" x2=".6" y2=".7" svg:style="stroke-width:1"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
+    <svg:rect x="0" y=".3" width="1" height=".4" style="stroke-width:1; fill:background"/>
+    <svg:line x1=".4" y1=".3" x2=".6" y2=".7" style="stroke-width:1"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/comelec2.shape
==============================================================================
--- trunk/shapes/Pneumatic/comelec2.shape	(original)
+++ trunk/shapes/Pneumatic/comelec2.shape	Sat Jul 26 10:59:23 2008
@@ -11,9 +11,9 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
-    <svg:rect x="0" y=".3" width="1" height=".4" svg:style="stroke-width:1; fill:background"/>
-    <svg:line x1=".2" y1=".7" x2=".4" y2=".3" svg:style="stroke-width:1"/>
-    <svg:line x1=".8" y1=".7" x2=".6" y2=".3" svg:style="stroke-width:1"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
+    <svg:rect x="0" y=".3" width="1" height=".4" style="stroke-width:1; fill:background"/>
+    <svg:line x1=".2" y1=".7" x2=".4" y2=".3" style="stroke-width:1"/>
+    <svg:line x1=".8" y1=".7" x2=".6" y2=".3" style="stroke-width:1"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/commusc.shape
==============================================================================
--- trunk/shapes/Pneumatic/commusc.shape	(original)
+++ trunk/shapes/Pneumatic/commusc.shape	Sat Jul 26 10:59:23 2008
@@ -8,10 +8,10 @@
   <point x="0.5" y="0.5" main="yes"/></connections>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
-    <svg:line x1="1" y1=".4" x2=".4" y2=".4" svg:style="stroke-width:1"/>
-    <svg:line x1="1" y1=".6" x2=".4" y2=".6" svg:style="stroke-width:1"/>
-    <svg:line x1=".4" y1=".7" x2=".4" y2=".3" svg:style="stroke-width:1"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
+    <svg:line x1="1" y1=".4" x2=".4" y2=".4" style="stroke-width:1"/>
+    <svg:line x1="1" y1=".6" x2=".4" y2=".6" style="stroke-width:1"/>
+    <svg:line x1=".4" y1=".7" x2=".4" y2=".3" style="stroke-width:1"/>
   </svg:svg>
 
 </shape>

Modified: trunk/shapes/Pneumatic/compb.shape
==============================================================================
--- trunk/shapes/Pneumatic/compb.shape	(original)
+++ trunk/shapes/Pneumatic/compb.shape	Sat Jul 26 10:59:23 2008
@@ -8,11 +8,11 @@
   <point x="0.5" y="0.5" main="yes"/></connections>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
-    <svg:line x1="1" y1=".4" x2=".4" y2=".4" svg:style="stroke-width:1"/>
-    <svg:line x1="1" y1=".6" x2=".4" y2=".6" svg:style="stroke-width:1"/>
-    <svg:line x1=".4" y1=".7" x2=".4" y2=".3" svg:style="stroke-width:1"/>
-    <svg:path d="M .4,.3 C .3,.4 .3,.6 .4,.7" svg:style="stroke-width:1"/> 
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
+    <svg:line x1="1" y1=".4" x2=".4" y2=".4" style="stroke-width:1"/>
+    <svg:line x1="1" y1=".6" x2=".4" y2=".6" style="stroke-width:1"/>
+    <svg:line x1=".4" y1=".7" x2=".4" y2=".3" style="stroke-width:1"/>
+    <svg:path d="M .4,.3 C .3,.4 .3,.6 .4,.7" style="stroke-width:1"/> 
   </svg:svg>
 
 </shape>

Modified: trunk/shapes/Pneumatic/compilh.shape
==============================================================================
--- trunk/shapes/Pneumatic/compilh.shape	(original)
+++ trunk/shapes/Pneumatic/compilh.shape	Sat Jul 26 10:59:23 2008
@@ -12,8 +12,8 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
-    <svg:rect x="0" y=".3" width="1" height=".4" svg:style="stroke-width:1; fill:background"/>
-    <svg:polygon points="0,.325 0,.675 .3,.5" svg:style="fill:foreground; stroke: none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
+    <svg:rect x="0" y=".3" width="1" height=".4" style="stroke-width:1; fill:background"/>
+    <svg:polygon points="0,.325 0,.675 .3,.5" style="fill:foreground; stroke: none"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/compilp.shape
==============================================================================
--- trunk/shapes/Pneumatic/compilp.shape	(original)
+++ trunk/shapes/Pneumatic/compilp.shape	Sat Jul 26 10:59:23 2008
@@ -12,8 +12,8 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
-    <svg:rect x="0" y=".3" width="1" height=".4" svg:style="stroke-width:1; fill:background"/>
-    <svg:polygon points="0,.325 0,.675 .3,.5" svg:style="fill:background; stroke-width:1;     stroke-linejoin: round;"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
+    <svg:rect x="0" y=".3" width="1" height=".4" style="stroke-width:1; fill:background"/>
+    <svg:polygon points="0,.325 0,.675 .3,.5" style="fill:background; stroke-width:1;     stroke-linejoin: round;"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/compush.shape
==============================================================================
--- trunk/shapes/Pneumatic/compush.shape	(original)
+++ trunk/shapes/Pneumatic/compush.shape	Sat Jul 26 10:59:23 2008
@@ -8,10 +8,10 @@
   <point x="0.5" y="0.5" main="yes"/></connections>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
-    <svg:line x1="1" y1=".4" x2=".4" y2=".4" svg:style="stroke-width:1"/>
-    <svg:line x1="1" y1=".6" x2=".4" y2=".6" svg:style="stroke-width:1"/>
-    <svg:path d="M .4,.4 C .2,.4 .2,.6 .4,.6" svg:style="stroke-width:1;"/> 
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
+    <svg:line x1="1" y1=".4" x2=".4" y2=".4" style="stroke-width:1"/>
+    <svg:line x1="1" y1=".6" x2=".4" y2=".6" style="stroke-width:1"/>
+    <svg:path d="M .4,.4 C .2,.4 .2,.6 .4,.6" style="stroke-width:1;"/> 
   </svg:svg>
 
 </shape>

Modified: trunk/shapes/Pneumatic/comspr.shape
==============================================================================
--- trunk/shapes/Pneumatic/comspr.shape	(original)
+++ trunk/shapes/Pneumatic/comspr.shape	Sat Jul 26 10:59:23 2008
@@ -8,8 +8,8 @@
   <point x="0.5" y="0.5" main="yes"/></connections>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke:none"/>
-    <svg:polyline points="1,.7 .9,.3 .8,.7 .7,.3 .6,.7 .5,.3     .4,.7 .3,.3 .2,.7 .2,.3" svg:style="stroke-width:1"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke:none"/>
+    <svg:polyline points="1,.7 .9,.3 .8,.7 .7,.3 .6,.7 .5,.3     .4,.7 .3,.3 .2,.7 .2,.3" style="stroke-width:1"/>
     <!-- This looks ugly (without anti-aliasing) but prints okay. -->
   </svg:svg>
 

Modified: trunk/shapes/Pneumatic/dejack.shape
==============================================================================
--- trunk/shapes/Pneumatic/dejack.shape	(original)
+++ trunk/shapes/Pneumatic/dejack.shape	Sat Jul 26 10:59:23 2008
@@ -13,11 +13,11 @@
   <textbox x1="0" y1="1.1" x2="3" y2="1.9"/>
   <aspectratio type="fixed"/>
   <svg:svg width="3" height="1">
-    <svg:line x1="0" y1="0" x2="3" y2="1" svg:style="stroke: none"/>
-    <svg:line x1=".6" y1="0" x2=".6" y2=".2" svg:style="stroke-width: 1.0"/>
-    <svg:line x1="2.8" y1="0" x2="2.8" y2=".2" svg:style="stroke-width: 1.0"/>
-    <svg:line x1="0" y1=".6" x2="2.4" y2=".6" svg:style="stroke-width: 0.5"/>
-    <svg:line x1="2.4" y1=".2" x2="2.4" y2="1" svg:style="stroke-width: 4.0"/>
-    <svg:rect x=".4" y=".2" width="2.6" height=".8" svg:style="stroke-width: 1.0"/>
+    <svg:line x1="0" y1="0" x2="3" y2="1" style="stroke: none"/>
+    <svg:line x1=".6" y1="0" x2=".6" y2=".2" style="stroke-width: 1.0"/>
+    <svg:line x1="2.8" y1="0" x2="2.8" y2=".2" style="stroke-width: 1.0"/>
+    <svg:line x1="0" y1=".6" x2="2.4" y2=".6" style="stroke-width: 0.5"/>
+    <svg:line x1="2.4" y1=".2" x2="2.4" y2="1" style="stroke-width: 4.0"/>
+    <svg:rect x=".4" y=".2" width="2.6" height=".8" style="stroke-width: 1.0"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/dist22.shape
==============================================================================
--- trunk/shapes/Pneumatic/dist22.shape	(original)
+++ trunk/shapes/Pneumatic/dist22.shape	Sat Jul 26 10:59:23 2008
@@ -13,13 +13,13 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="2" height="1">
-    <svg:rect x="0" y="0" width="1" height="1" svg:style="fill:background; stroke-width: 1"/>
-    <svg:rect x="1" y="0" width="1" height="1" svg:style="fill:background; stroke-width: 1"/>
-    <svg:line x1=".5" y1="1" x2=".5" y2=".2" svg:style="stroke-width: 1"/>
-    <svg:polygon points=".4,.2 .6,.2 .5,0" svg:style="stroke:none; fill:foreground"/>
-    <svg:line x1="1.5" y1="0" x2="1.5" y2=".2" svg:style="stroke-width: 1"/>
-    <svg:line x1="1.4" y1=".2" x2="1.6" y2=".2" svg:style="stroke-width: 1"/>
-    <svg:line x1="1.5" y1=".8" x2="1.5" y2="1" svg:style="stroke-width: 1"/>
-    <svg:line x1="1.4" y1=".8" x2="1.6" y2=".8" svg:style="stroke-width: 1"/>
+    <svg:rect x="0" y="0" width="1" height="1" style="fill:background; stroke-width: 1"/>
+    <svg:rect x="1" y="0" width="1" height="1" style="fill:background; stroke-width: 1"/>
+    <svg:line x1=".5" y1="1" x2=".5" y2=".2" style="stroke-width: 1"/>
+    <svg:polygon points=".4,.2 .6,.2 .5,0" style="stroke:none; fill:foreground"/>
+    <svg:line x1="1.5" y1="0" x2="1.5" y2=".2" style="stroke-width: 1"/>
+    <svg:line x1="1.4" y1=".2" x2="1.6" y2=".2" style="stroke-width: 1"/>
+    <svg:line x1="1.5" y1=".8" x2="1.5" y2="1" style="stroke-width: 1"/>
+    <svg:line x1="1.4" y1=".8" x2="1.6" y2=".8" style="stroke-width: 1"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/dist32.shape
==============================================================================
--- trunk/shapes/Pneumatic/dist32.shape	(original)
+++ trunk/shapes/Pneumatic/dist32.shape	Sat Jul 26 10:59:23 2008
@@ -15,15 +15,15 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="2" height="1">
-    <svg:rect x="0" y="0" width="1" height="1" svg:style="fill:background; stroke-width: 1"/>
-    <svg:rect x="1" y="0" width="1" height="1" svg:style="fill:background; stroke-width: 1"/>
-    <svg:line x1=".25" y1="1" x2=".25" y2=".2" svg:style="stroke-width: 1"/>
-    <svg:polygon points=".15,.2 .35,.2 .25,0" svg:style="stroke:none; fill:foreground"/>
-    <svg:line x1=".75" y1=".8" x2=".75" y2="1" svg:style="stroke-width: 1"/>
-    <svg:line x1=".65" y1=".8" x2=".85" y2=".8" svg:style="stroke-width: 1"/>
-    <svg:line x1="1.25" y1=".8" x2="1.25" y2="1" svg:style="stroke-width: 1"/>
-    <svg:line x1="1.15" y1=".8" x2="1.35" y2=".8" svg:style="stroke-width: 1"/>
-    <svg:line x1="1.25" y1="0" x2="1.75" y2="1" svg:style="stroke-width:1"/>
-    <svg:polygon points="1.8,.8 1.8,1 1.6,.9" svg:style="stroke:none; fill:foreground"/>
+    <svg:rect x="0" y="0" width="1" height="1" style="fill:background; stroke-width: 1"/>
+    <svg:rect x="1" y="0" width="1" height="1" style="fill:background; stroke-width: 1"/>
+    <svg:line x1=".25" y1="1" x2=".25" y2=".2" style="stroke-width: 1"/>
+    <svg:polygon points=".15,.2 .35,.2 .25,0" style="stroke:none; fill:foreground"/>
+    <svg:line x1=".75" y1=".8" x2=".75" y2="1" style="stroke-width: 1"/>
+    <svg:line x1=".65" y1=".8" x2=".85" y2=".8" style="stroke-width: 1"/>
+    <svg:line x1="1.25" y1=".8" x2="1.25" y2="1" style="stroke-width: 1"/>
+    <svg:line x1="1.15" y1=".8" x2="1.35" y2=".8" style="stroke-width: 1"/>
+    <svg:line x1="1.25" y1="0" x2="1.75" y2="1" style="stroke-width:1"/>
+    <svg:polygon points="1.8,.8 1.8,1 1.6,.9" style="stroke:none; fill:foreground"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/dist42.shape
==============================================================================
--- trunk/shapes/Pneumatic/dist42.shape	(original)
+++ trunk/shapes/Pneumatic/dist42.shape	Sat Jul 26 10:59:23 2008
@@ -17,16 +17,16 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="2" height="1">
-    <svg:rect x="0" y="0" width="1" height="1" svg:style="fill:background; stroke-width: 1"/>
-    <svg:rect x="1" y="0" width="1" height="1" svg:style="fill:background; stroke-width: 1"/>
-    <svg:line x1=".25" y1="1" x2=".25" y2=".2" svg:style="stroke-width: 1"/>
-    <svg:polygon points=".15,.2 .35,.2 .25,0" svg:style="stroke:none; fill:foreground"/>
-    <svg:line x1=".75" y1=".8" x2=".75" y2="0" svg:style="stroke-width: 1"/>
-    <svg:polygon points=".65,.8 .85,.8 .75,1" svg:style="stroke:none; fill:foreground"/>
+    <svg:rect x="0" y="0" width="1" height="1" style="fill:background; stroke-width: 1"/>
+    <svg:rect x="1" y="0" width="1" height="1" style="fill:background; stroke-width: 1"/>
+    <svg:line x1=".25" y1="1" x2=".25" y2=".2" style="stroke-width: 1"/>
+    <svg:polygon points=".15,.2 .35,.2 .25,0" style="stroke:none; fill:foreground"/>
+    <svg:line x1=".75" y1=".8" x2=".75" y2="0" style="stroke-width: 1"/>
+    <svg:polygon points=".65,.8 .85,.8 .75,1" style="stroke:none; fill:foreground"/>
 
-    <svg:line x1="1.25" y1="0" x2="1.75" y2="1" svg:style="stroke-width:1"/>
-    <svg:polygon points="1.8,.8 1.8,1 1.6,.9" svg:style="stroke:none; fill:foreground"/>
-    <svg:line x1="1.25" y1="1" x2="1.75" y2="0" svg:style="stroke-width:1"/>
-    <svg:polygon points="1.8,0 1.8,.2 1.6,.1" svg:style="stroke:none; fill:foreground"/>
+    <svg:line x1="1.25" y1="0" x2="1.75" y2="1" style="stroke-width:1"/>
+    <svg:polygon points="1.8,.8 1.8,1 1.6,.9" style="stroke:none; fill:foreground"/>
+    <svg:line x1="1.25" y1="1" x2="1.75" y2="0" style="stroke-width:1"/>
+    <svg:polygon points="1.8,0 1.8,.2 1.6,.1" style="stroke:none; fill:foreground"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/dist52.shape
==============================================================================
--- trunk/shapes/Pneumatic/dist52.shape	(original)
+++ trunk/shapes/Pneumatic/dist52.shape	Sat Jul 26 10:59:23 2008
@@ -19,8 +19,8 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="2" height="1">
-    <svg:rect x="0" y="0" width="1" height="1" svg:style="fill:background; stroke-width: 1"/>
-    <svg:rect x="1" y="0" width="1" height="1" svg:style="fill:background; stroke-width: 1"/>
+    <svg:rect x="0" y="0" width="1" height="1" style="fill:background; stroke-width: 1"/>
+    <svg:rect x="1" y="0" width="1" height="1" style="fill:background; stroke-width: 1"/>
 
     <svg:line x1="1.25" y1="1" x2="1.375" y2="0"/> 
     <svg:line x1="1.50" y1="1" x2="1.625" y2="0"/>
@@ -32,10 +32,10 @@
     <svg:line x1=".50" y1="1" x2=".375" y2="0"/>   
     <svg:line x1=".75" y1="1" x2=".625" y2="0"/>
 
-    <svg:polygon points="1.625,0 1.525,.16 1.705,.2" svg:style="stroke:none; fill:foreground"/>
-    <svg:polygon points="1.250,1 1.350,.84 1.170,.80" svg:style="stroke:none; fill:foreground"/>
+    <svg:polygon points="1.625,0 1.525,.16 1.705,.2" style="stroke:none; fill:foreground"/>
+    <svg:polygon points="1.250,1 1.350,.84 1.170,.80" style="stroke:none; fill:foreground"/>
 
-    <svg:polygon points=".375,0 .295,.2 .475,.16" svg:style="stroke:none; fill:foreground"/>
-    <svg:polygon points=".750,1 .830,.80 .650,.84" svg:style="stroke:none; fill:foreground"/>
+    <svg:polygon points=".375,0 .295,.2 .475,.16" style="stroke:none; fill:foreground"/>
+    <svg:polygon points=".750,1 .830,.80 .650,.84" style="stroke:none; fill:foreground"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/drain.shape
==============================================================================
--- trunk/shapes/Pneumatic/drain.shape	(original)
+++ trunk/shapes/Pneumatic/drain.shape	Sat Jul 26 10:59:23 2008
@@ -9,9 +9,9 @@
   <point x="0.5" y="0.5" main="yes"/></connections>
   <aspectratio type="fixed"/>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke: none"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke: none"/>
     <svg:line x1="0" y1=".5" x2=".6" y2=".5"/>
-    <svg:polygon points=".6,.25 1,.5 .6,.75" svg:style="fill:background; stroke-width:1.0"/>
+    <svg:polygon points=".6,.25 1,.5 .6,.75" style="fill:background; stroke-width:1.0"/>
   </svg:svg>
 
 </shape>

Modified: trunk/shapes/Pneumatic/press.shape
==============================================================================
--- trunk/shapes/Pneumatic/press.shape	(original)
+++ trunk/shapes/Pneumatic/press.shape	Sat Jul 26 10:59:23 2008
@@ -10,9 +10,9 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="2" height="1">
-    <svg:line x1="0" y1="0" x2="2" y2="1" svg:style="stroke: none"/>
-    <svg:circle cx=".5" cy=".5" r=".3" svg:style="stroke-width: 1.0"/>
-    <svg:circle cx=".5" cy=".5" r=".125" svg:style="fill:foreground; stroke: none"/>
+    <svg:line x1="0" y1="0" x2="2" y2="1" style="stroke: none"/>
+    <svg:circle cx=".5" cy=".5" r=".3" style="stroke-width: 1.0"/>
+    <svg:circle cx=".5" cy=".5" r=".125" style="fill:foreground; stroke: none"/>
     <svg:line x1=".8" y1=".5" x2="2" y2=".5"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/presshy.shape
==============================================================================
--- trunk/shapes/Pneumatic/presshy.shape	(original)
+++ trunk/shapes/Pneumatic/presshy.shape	Sat Jul 26 10:59:23 2008
@@ -10,11 +10,11 @@
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg width="2" height="1">
-    <svg:line x1="0" y1="0" x2="2" y2="1" svg:style="stroke: none"/>
-    <svg:circle cx=".5" cy=".5" r=".3" svg:style="stroke-width: 1.0"/>
-    <svg:circle cx=".5" cy=".5" r=".125" svg:style="fill:foreground; stroke: none"/>
+    <svg:line x1="0" y1="0" x2="2" y2="1" style="stroke: none"/>
+    <svg:circle cx=".5" cy=".5" r=".3" style="stroke-width: 1.0"/>
+    <svg:circle cx=".5" cy=".5" r=".125" style="fill:foreground; stroke: none"/>
     <svg:line x1=".8" y1=".5" x2="1.2" y2=".5"/>
     <svg:line x1=".6" y1=".5" x2="2" y2=".5"/>
-    <svg:polygon points="1.2,.25 1.6,.5 1.2,.75" svg:style="fill:foreground; stroke: none"/>
+    <svg:polygon points="1.2,.25 1.6,.5 1.2,.75" style="fill:foreground; stroke: none"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/presspn.shape
==============================================================================
--- trunk/shapes/Pneumatic/presspn.shape	(original)
+++ trunk/shapes/Pneumatic/presspn.shape	Sat Jul 26 10:59:23 2008
@@ -9,12 +9,12 @@
   <point x="1" y="0.5" main="yes"/></connections>
   <aspectratio type="fixed"/>
   <svg:svg width="2" height="1">
-    <svg:line x1="0" y1="0" x2="2" y2="1" svg:style="stroke: none"/>
-    <svg:circle cx=".5" cy=".5" r=".3" svg:style="stroke-width: 1.0"/>
-    <svg:circle cx=".5" cy=".5" r=".125" svg:style="fill:foreground; stroke: none"/>
+    <svg:line x1="0" y1="0" x2="2" y2="1" style="stroke: none"/>
+    <svg:circle cx=".5" cy=".5" r=".3" style="stroke-width: 1.0"/>
+    <svg:circle cx=".5" cy=".5" r=".125" style="fill:foreground; stroke: none"/>
     <svg:line x1=".8" y1=".5" x2="1.2" y2=".5"/>
     <svg:line x1=".6" y1=".5" x2="2" y2=".5"/>
-    <svg:polygon points="1.2,.25 1.6,.5 1.2,.75" svg:style="fill:background; stroke-width:1.0"/>
+    <svg:polygon points="1.2,.25 1.6,.5 1.2,.75" style="fill:background; stroke-width:1.0"/>
   </svg:svg>
 
 </shape>

Modified: trunk/shapes/Pneumatic/seijack.shape
==============================================================================
--- trunk/shapes/Pneumatic/seijack.shape	(original)
+++ trunk/shapes/Pneumatic/seijack.shape	Sat Jul 26 10:59:23 2008
@@ -12,11 +12,11 @@
   <textbox x1="0" y1="1.1" x2="3" y2="1.9"/>
   <aspectratio type="fixed"/>
   <svg:svg width="3" height="1">
-    <svg:line x1="0" y1="0" x2="3" y2="1" svg:style="stroke: none"/>
-    <svg:line x1="2.8" y1="0" x2="2.8" y2=".2" svg:style="stroke-width: 1.0"/>
-    <svg:line x1="0" y1=".6" x2="2.4" y2=".6" svg:style="stroke-width: 0.5"/>
-    <svg:line x1="2.4" y1=".2" x2="2.4" y2="1" svg:style="stroke-width: 4.0"/>
-    <svg:rect x=".4" y=".2" width="2.6" height=".8" svg:style="stroke-width: 1.0"/>
-    <svg:polyline points=".6,.4 .6,.8 1,.4 1,.8 1.4,.4      1.4,.8 1.8,.4 1.8,.8 2.2,.4 2.2,.8" svg:style="stroke-width: .5"/>
+    <svg:line x1="0" y1="0" x2="3" y2="1" style="stroke: none"/>
+    <svg:line x1="2.8" y1="0" x2="2.8" y2=".2" style="stroke-width: 1.0"/>
+    <svg:line x1="0" y1=".6" x2="2.4" y2=".6" style="stroke-width: 0.5"/>
+    <svg:line x1="2.4" y1=".2" x2="2.4" y2="1" style="stroke-width: 4.0"/>
+    <svg:rect x=".4" y=".2" width="2.6" height=".8" style="stroke-width: 1.0"/>
+    <svg:polyline points=".6,.4 .6,.8 1,.4 1,.8 1.4,.4      1.4,.8 1.8,.4 1.8,.8 2.2,.4 2.2,.8" style="stroke-width: .5"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/Pneumatic/seojack.shape
==============================================================================
--- trunk/shapes/Pneumatic/seojack.shape	(original)
+++ trunk/shapes/Pneumatic/seojack.shape	Sat Jul 26 10:59:23 2008
@@ -12,11 +12,11 @@
   <textbox x1="0" y1="1.1" x2="3" y2="1.9"/>
   <aspectratio type="fixed"/>
   <svg:svg width="4" height="1">
-    <svg:line x1="-1" y1="0" x2="3" y2="1" svg:style="stroke: none"/>
-    <svg:line x1=".6" y1="0" x2=".6" y2=".2" svg:style="stroke-width: 1.0"/>
-    <svg:line x1="-1" y1=".6" x2="1" y2=".6" svg:style="stroke-width: 0.5"/>
-    <svg:line x1="1" y1=".2" x2="1" y2="1" svg:style="stroke-width: 4.0"/>
-    <svg:rect x=".4" y=".2" width="2.6" height=".8" svg:style="stroke-width: 1.0"/>
-    <svg:polyline points="1.2,.4 1.2,.8 1.6,.4 1.6,.8 2.0,.4 2.0,.8                2.4,.4 2.4,.8 2.8,.4 2.8,.8" svg:style="stroke-width: .5"/>
+    <svg:line x1="-1" y1="0" x2="3" y2="1" style="stroke: none"/>
+    <svg:line x1=".6" y1="0" x2=".6" y2=".2" style="stroke-width: 1.0"/>
+    <svg:line x1="-1" y1=".6" x2="1" y2=".6" style="stroke-width: 0.5"/>
+    <svg:line x1="1" y1=".2" x2="1" y2="1" style="stroke-width: 4.0"/>
+    <svg:rect x=".4" y=".2" width="2.6" height=".8" style="stroke-width: 1.0"/>
+    <svg:polyline points="1.2,.4 1.2,.8 1.6,.4 1.6,.8 2.0,.4 2.0,.8                2.4,.4 2.4,.8 2.8,.4 2.8,.8" style="stroke-width: .5"/>
   </svg:svg>
 </shape>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]