[qet] [1061] Add new symbols , thx pawel

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]

To: qet@xxxxxxxxxxxxxxxxxxx
Subject: [qet] [1061] Add new symbols , thx pawel
From: subversion@xxxxxxxxxxxxx
Date: Sat, 19 Jun 2010 12:32:05 +0200

Revision: 1061
Author:   scorpio810
Date:     2010-06-19 12:32:03 +0200 (Sat, 19 Jun 2010)
Log Message:
-----------
Add new symbols , thx pawel

Modified Paths:
--------------
    branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs-e8511.elmt
    branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_1.elmt
    branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_2.elmt
    branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_3.elmt
    branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_4.elmt

Added Paths:
-----------
    branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/c4000_eco_r.elmt
    branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/c4000_eco_s.elmt
    branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs-e7511.elmt
    branches/0.3/elements/blocs_de_securite/pilz/
    branches/0.3/elements/blocs_de_securite/pilz/pilz.elmt
    branches/0.3/elements/blocs_de_securite/pilz/qet_directory
    branches/0.3/elements/blocs_de_securite/preventa/
    branches/0.3/elements/blocs_de_securite/preventa/preventa_2/
    branches/0.3/elements/blocs_de_securite/preventa/preventa_2/qet_directory
    branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_ac.elmt
    branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_af.elmt
    branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_afl.elmt
    branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_al.elmt
    branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_asf.elmt
    branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_ba.elmt
    branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_bc.elmt
    branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_bf.elmt
    branches/0.3/elements/blocs_de_securite/preventa/qet_directory
    branches/0.3/elements/blocs_de_securite/preventa/xps-al.elmt
    branches/0.3/elements/blocs_de_securite/preventa/xps_ac.elmt
    branches/0.3/elements/blocs_de_securite/preventa/xps_af.elmt
    branches/0.3/elements/blocs_de_securite/preventa/xps_afl.elmt
    branches/0.3/elements/blocs_de_securite/preventa/xps_asf.elmt
    branches/0.3/elements/blocs_de_securite/preventa/xps_ba.elmt
    branches/0.3/elements/blocs_de_securite/preventa/xps_bc.elmt
    branches/0.3/elements/blocs_de_securite/preventa/xps_bf.elmt
    branches/0.3/elements/blocs_de_securite/sick/
    branches/0.3/elements/blocs_de_securite/sick/qet_directory
    branches/0.3/elements/blocs_de_securite/sick/ue410-2ro.elmt
    branches/0.3/elements/blocs_de_securite/sick/ue410-mu.elmt
    branches/0.3/elements/blocs_de_securite/sick/ue410-xu.elmt

Removed Paths:
-------------
    branches/0.3/elements/blocs_de_securite/pilz.elmt
    branches/0.3/elements/blocs_de_securite/xps-al.elmt
    branches/0.3/elements/blocs_de_securite/xps_ac.elmt
    branches/0.3/elements/blocs_de_securite/xps_af.elmt
    branches/0.3/elements/blocs_de_securite/xps_afl.elmt
    branches/0.3/elements/blocs_de_securite/xps_asf.elmt
    branches/0.3/elements/blocs_de_securite/xps_ba.elmt
    branches/0.3/elements/blocs_de_securite/xps_bc.elmt
    branches/0.3/elements/blocs_de_securite/xps_bf.elmt

Added: branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/c4000_eco_r.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/c4000_eco_r.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/c4000_eco_r.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,57 @@
+<definition width="80" version="0.22" hotspot_x="20" hotspot_y="35" height="150" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">C4000 ECO (R)</name>
+        <name lang="fr">C4000 ECO (R)</name>
+        <name lang="pl">C4000 ECO (R)</name>
+        <name lang="cs">C4000 ECO (R)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="-4" y="95" size="7" rotate="true" text="receiver"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="100" x1="-10" y2="100" x2="44"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="71" x1="44" y2="100" x2="44"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-30" x1="-10" y2="100" x2="-10"/>
+        <input x="-6" y="85.5" size="9" rotate="true" text="C4000"/>
+        <input x="43" y="-17.5" size="5" rotate="true" text="1"/>
+        <input x="43" y="2.5" size="5" rotate="true" text="2"/>
+        <input x="43" y="22.5" size="5" rotate="true" text="3"/>
+        <input x="43" y="41.5" size="5" rotate="true" text="4"/>
+        <input x="43" y="62.5" size="5" rotate="true" text="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-8" x1="44" y2="8" x2="44"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-30" x1="-10" y2="-30" x2="44"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-11" x1="44" y2="-30" x2="44"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="48" y2="-10" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="48" y2="-9" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="48" y2="-11" x2="41"/>
+        <arc width="6" x="44.5" y="-13" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="52" x1="44" y2="68" x2="44"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="32" x1="44" y2="48" x2="44"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="12" x1="44" y2="28" x2="44"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="48" y2="70" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="48" y2="50" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="48" y2="30" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="48" y2="10" x2="41"/>
+        <input x="2" y="11" size="7" rotate="true" text="OSSD1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="48" y2="71" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="51" x1="48" y2="51" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31" x1="48" y2="31" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11" x1="48" y2="11" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="69" x1="48" y2="69" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="49" x1="48" y2="49" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="48" y2="29" x2="41"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="48" y2="9" x2="41"/>
+        <arc width="6" x="44.5" y="67" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="6" x="44.5" y="47" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="6" x="44.5" y="27" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc width="6" x="44.5" y="7" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <input x="2" y="51" size="7" rotate="true" text="OSSD2"/>
+        <input x="21" y="71" size="7" rotate="true" text="FE"/>
+        <input x="5" y="31" size="7" rotate="true" text="0V DC"/>
+        <input x="11" y="-9" size="7" rotate="true" text="+24V"/>
+        <terminal x="51" y="-10" orientation="e"/>
+        <terminal x="51" y="10" orientation="e"/>
+        <terminal x="51" y="30" orientation="e"/>
+        <terminal x="51" y="50" orientation="e"/>
+        <terminal x="51" y="70" orientation="e"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/c4000_eco_s.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/c4000_eco_s.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/c4000_eco_s.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,57 @@
+<definition width="80" version="0.22" hotspot_x="20" hotspot_y="35" height="150" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">C4000S ECO (S)</name>
+        <name lang="fr">C4000S ECO (S)</name>
+        <name lang="pl">C4000S ECO (S)</name>
+        <name lang="cs">C4000S ECO (S)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <input x="4" y="95" size="7" rotate="true" text="sender"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="100" x1="-4" y2="100" x2="50"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="72" x1="-4" y2="100" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-30" x1="50" y2="100" x2="50"/>
+        <input x="1" y="84.5" size="9" rotate="true" text="C4000"/>
+        <input x="-15" y="2.5" size="5" rotate="true" text="2"/>
+        <input x="-15" y="62.5" size="5" rotate="true" text="5"/>
+        <input x="-15" y="42.5" size="5" rotate="true" text="4"/>
+        <input x="-15" y="22.5" size="5" rotate="true" text="3"/>
+        <input x="-15" y="-17.5" size="5" rotate="true" text="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-30" x1="-4" y2="-12" x2="-4"/>
+        <input x="-1" y="31" size="7" rotate="true" text="0V DC"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-1" y2="-10" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-8" x1="-4" y2="8" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="52" x1="-4" y2="68" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-1" y2="-9" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-1" y2="10" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-1" y2="70" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-1" y2="50" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-1" y2="-11" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11" x1="-1" y2="11" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="-1" y2="71" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="51" x1="-1" y2="51" x2="-8"/>
+        <arc width="6" x="-10.5" y="-13" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-1" y2="9" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="69" x1="-1" y2="69" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="49" x1="-1" y2="49" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-30" x1="-4" y2="-30" x2="50"/>
+        <arc width="6" x="-10.5" y="7" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="6" x="-10.5" y="67" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <arc width="6" x="-10.5" y="47" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="32" x1="-4" y2="48" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="12" x1="-4" y2="28" x2="-4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-1" y2="30" x2="-8"/>
+        <input x="-1" y="11" size="7" rotate="true" text="reserved"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31" x1="-1" y2="31" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="-1" y2="29" x2="-8"/>
+        <arc width="6" x="-10.5" y="27" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
+        <input x="-1" y="71" size="7" rotate="true" text="FE"/>
+        <input x="-1" y="51" size="7" rotate="true" text="reserved"/>
+        <input x="-1" y="-8" size="7" rotate="true" text="+24V"/>
+        <terminal x="-11" y="30" orientation="w"/>
+        <terminal x="-11" y="50" orientation="w"/>
+        <terminal x="-11" y="70" orientation="w"/>
+        <terminal x="-11" y="10" orientation="w"/>
+        <terminal x="-11" y="-10" orientation="w"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs-e7511.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs-e7511.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs-e7511.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,106 @@
+<definition width="300" version="0.22" hotspot_x="70" hotspot_y="40" height="100" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">XCS-E7511</name>
+        <name lang="fr">XCS-E7511</name>
+        <name lang="pl">XCS-E7511</name>
+        <name lang="cs">XCS-E7511</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="45" x1="30" y2="20" x2="30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="45" x1="60" y2="20" x2="60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="140" y2="1" x2="140"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="90" y2="0" x2="90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="30" y2="-1" x2="30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-40" y2="0" x2="-34"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-40" y2="-25" x2="-40"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="45" x1="-20" y2="20" x2="-20" y3="-1" x3="-15"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="-25" x2="-20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-25" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="10" x1="93" y2="10" x2="129"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="90" y2="0" x2="96"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="110" y2="-25" x2="110"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="45" x1="110" y2="20" x2="110" y3="-1" x3="104"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="45" x1="90" y2="20" x2="90" y3="-1" x3="95"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="45" x1="-40" y2="20" x2="-40" y3="-1" x3="-35"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="34" y2="-28" x2="88"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="34" y2="48" x2="58"/>
+        <input x="55" y="49" size="7" rotation="270" rotate="true" text="X3"/>
+        <circle x="29" y="-11" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="2"/>
+        <circle x="57.7639" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="60" y2="-10" x2="31"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="60" y2="-10" x2="60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="11" x1="-37" y2="11" x2="-3"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="20" x2="0" y3="45" x3="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="143" y2="48" x2="220"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="114" y2="48" x2="138"/>
+        <circle x="50" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="93" y2="48" x2="107"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.97" x1="67.03" y2="17.03" x2="52.97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="64" y2="48" x2="88"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.97" x1="52.97" y2="17.03" x2="67.03"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="4" y2="48" x2="28"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="-17" y2="48" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="-37" y2="48" x2="-23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="143" y2="-28" x2="220"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="114" y2="-28" x2="138"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="93" y2="-28" x2="107"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="4" y2="-28" x2="28"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-17" y2="-28" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-37" y2="-28" x2="-23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="-60" y2="48" x2="-42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="220" y2="48" x2="220"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="48" x2="-60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="-43"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="45" x1="140" y2="18" x2="140"/>
+        <input x="-45" y="-11" size="7" rotation="270" rotate="true" text="21"/>
+        <input x="135" y="49" size="7" rotation="270" rotate="true" text="E2"/>
+        <input x="105" y="49" size="7" rotation="270" rotate="true" text="44"/>
+        <input x="25" y="-11" size="7" rotation="270" rotate="true" text="X1"/>
+        <input x="-5" y="-11" size="7" rotation="270" rotate="true" text="13"/>
+        <input x="-25" y="-11" size="7" rotation="270" rotate="true" text="31"/>
+        <circle x="-42.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-45" y="49" size="7" rotation="270" rotate="true" text="22"/>
+        <circle x="-42.2361" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="135" y="-10" size="7" rotation="270" rotate="true" text="E1"/>
+        <circle x="137.764" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="107.764" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="85" y="49" size="7" rotation="270" rotate="true" text="52"/>
+        <input x="25" y="49" size="7" rotation="270" rotate="true" text="X2"/>
+        <input x="105" y="-11" size="7" rotation="270" rotate="true" text="43"/>
+        <input x="85" y="-11" size="7" rotation="270" rotate="true" text="51"/>
+        <input x="-5" y="49" size="7" rotation="270" rotate="true" text="14"/>
+        <input x="-25" y="49" size="7" rotation="270" rotate="true" text="32"/>
+        <circle x="137.764" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="87.7639" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="27.7639" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="107.764" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="87.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="27.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-2.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-22.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-2.2361" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-22.2361" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <rect width="22" x="129" y="2" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="152" y="10.5" size="9" rotate="true" text="XCS-E7511"/>
+        <circle x="20" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.97" x1="37.03" y2="17.03" x2="22.97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.97" x1="22.97" y2="17.03" x2="37.03"/>
+        <terminal x="-40" y="51" orientation="s"/>
+        <terminal x="-40" y="-31" orientation="n"/>
+        <terminal x="-20" y="51" orientation="s"/>
+        <terminal x="0" y="51" orientation="s"/>
+        <terminal x="-20" y="-31" orientation="n"/>
+        <terminal x="0" y="-31" orientation="n"/>
+        <terminal x="30" y="-31" orientation="n"/>
+        <terminal x="90" y="-31" orientation="n"/>
+        <terminal x="110" y="-31" orientation="n"/>
+        <terminal x="30" y="51" orientation="s"/>
+        <terminal x="90" y="51" orientation="s"/>
+        <terminal x="110" y="51" orientation="s"/>
+        <terminal x="140" y="51" orientation="s"/>
+        <terminal x="140" y="-31" orientation="n"/>
+        <terminal x="60" y="51" orientation="s"/>
+    </description>
+</definition>

Modified: branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs-e8511.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs-e8511.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs-e8511.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,107 +1,96 @@
-<definition width="270" version="0.22" hotspot_x="70" hotspot_y="40" height="100" type="element" ic="true" orientation="dyyy" >
+<definition width="270" version="0.22" hotspot_x="70" hotspot_y="40" height="100" type="element" ic="true" orientation="dyyy">
     <names>
-	<name lang="en" >XCS-E8511</name>
-	<name lang="fr" >XCS-E8511</name>
-        <name lang="pl" >XCS-E8511</name>
-        <name lang="cs" >XCS-E8511</name>
+        <name lang="en">XCS-E8511</name>
+        <name lang="fr">XCS-E8511</name>
+        <name lang="pl">XCS-E8511</name>
+        <name lang="cs">XCS-E8511</name>
     </names>
-    <informations>TELEMECANIQUE</informations>
+    <informations></informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="55" y2="20" x2="60" y3="40" x3="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="10" x1="57" y2="10" x2="99" />
-        <rect width="22" x="99" y="2" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="10" x1="-37" y2="10" x2="2" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="110" y2="-19" x2="110" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="110" y2="39" x2="110" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="75" y2="50" x2="75" />
-        <input x="123" y="12.6667" size="9" rotate="true" text="XCS-E8511" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="55" y2="50" x2="55" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="30" y2="40" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="80" y2="1.00003" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="30" y2="0" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="60" y2="1" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-45" y2="50" x2="-45" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="80" y2="20" x2="80" y3="3.33333e-05" x3="85" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-40" y2="1" x2="-40" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="-40" y2="20" x2="-40" y3="0" x3="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="85" y2="50" x2="85" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-35" y2="50" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="65" y2="50" x2="65" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-45" y2="40" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="75" y2="40" x2="85" />
-        <circle x="20" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="55" y2="40" x2="65" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="25" y2="50" x2="25" />
-        <text x="76" y="47.3333" size="5" text="52" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-5" y2="50" x2="-5" />
-        <text x="56" y="47.3333" size="5" text="44" />
-        <text x="-44" y="47.3333" size="5" text="32" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="85" y2="-30" x2="85" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-25" y2="50" x2="-25" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="65" y2="-30" x2="65" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-35" y2="-30" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="75" y2="-20" x2="75" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.97" x1="37.03" y2="17.03" x2="22.97" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="55" y2="-20" x2="55" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="1.00003" x2="0" />
-        <text x="77" y="-22.6667" size="5" text="51" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-20" y2="1" x2="-20" />
-        <text x="56" y="-22.6667" size="5" text="43" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-45" y2="-20" x2="-45" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="75" y2="-20" x2="85" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.97" x1="22.97" y2="17.03" x2="37.03" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="55" y2="-20" x2="65" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="0" y2="20" x2="0" y3="3.33333e-05" x3="5" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.00003" x1="80" y2="1.00003" x2="86" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="-20" y2="20" x2="-20" y3="0" x3="-15" />
-        <text x="-43" y="-22.6667" size="5" text="31" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="105" y2="50" x2="105" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="35" y2="50" x2="35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="5" y2="50" x2="5" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-15" y2="50" x2="-15" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-45" y2="-20" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="25" y2="40" x2="35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-5" y2="40" x2="5" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-25" y2="40" x2="-15" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="-40" y2="1" x2="-34" />
-        <rect width="250" x="-60" y="-30" antialias="false" height="80" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="26" y="47.3333" size="5" text="X2" />
-        <text x="-4" y="47.3333" size="5" text="12" />
-        <text x="-24" y="47.3333" size="5" text="22" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="115" y2="50" x2="115" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="35" y2="-30" x2="35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="5" y2="-30" x2="5" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-30" x2="-15" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="105" y2="40" x2="115" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="25" y2="-20" x2="25" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-5" y2="-20" x2="-5" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-25" y2="-20" x2="-25" />
-        <text x="106" y="47.3333" size="5" text="E2" />
-        <text x="26" y="-22.6667" size="5" text="X1" />
-        <text x="-3" y="-22.6667" size="5" text="11" />
-        <text x="-23" y="-22.6667" size="5" text="21" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="115" y2="-30" x2="115" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="25" y2="-20" x2="35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-5" y2="-20" x2="5" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-25" y2="-20" x2="-15" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="105" y2="-20" x2="105" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.00003" x1="0" y2="1.00003" x2="6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="-20" y2="1" x2="-14" />
-        <text x="106" y="-22.6667" size="5" text="E1" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="105" y2="-20" x2="115" />
-        <terminal x="-40" y="-30" orientation="n" />
-        <terminal x="-40" y="50" orientation="s" />
-        <terminal x="-20" y="-30" orientation="n" />
-        <terminal x="-20" y="50" orientation="s" />
-        <terminal x="0" y="-30" orientation="n" />
-        <terminal x="0" y="50" orientation="s" />
-        <terminal x="30" y="-30" orientation="n" />
-        <terminal x="30" y="50" orientation="s" />
-        <terminal x="110" y="-30" orientation="n" />
-        <terminal x="110" y="50" orientation="s" />
-        <terminal x="60" y="-30" orientation="n" />
-        <terminal x="60" y="50" orientation="s" />
-        <terminal x="80" y="-30" orientation="n" />
-        <terminal x="80" y="50" orientation="s" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="45" x1="30" y2="21" x2="30"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="45" x1="60" y2="20" x2="60" y3="0" x3="55"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="110" y2="1" x2="110"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="60" y2="0" x2="60"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="45" x1="-40" y2="20" x2="-40" y3="-1" x3="-35"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="45" x1="-20" y2="20" x2="-20" y3="-1" x3="-15"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="45" x1="0" y2="20" x2="0" y3="-1" x3="5"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="45" x1="80" y2="20" x2="80" y3="-1" x3="85"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="113" y2="48" x2="190"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-40" y2="0" x2="-34"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="6"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="80" y2="0" x2="86"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="84" y2="48" x2="108"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-40" y2="-25" x2="-40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="-25" x2="-20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-25" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="80" y2="-25" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="63" y2="48" x2="77"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="34" y2="48" x2="58"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="4" y2="48" x2="28"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="-17" y2="48" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="-37" y2="48" x2="-23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="113" y2="-28" x2="190"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="84" y2="-28" x2="108"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="63" y2="-28" x2="77"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="34" y2="-28" x2="58"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="4" y2="-28" x2="28"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-17" y2="-28" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-37" y2="-28" x2="-23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="48" x1="-60" y2="48" x2="-42"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="190" y2="48" x2="190"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="48" x2="-60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="-43"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="45" x1="110" y2="18" x2="110"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="-26" x2="30"/>
+        <input x="-45" y="-11" size="7" rotation="270" rotate="true" text="31"/>
+        <input x="105" y="49" size="7" rotation="270" rotate="true" text="E2"/>
+        <input x="75" y="49" size="7" rotation="270" rotate="true" text="52"/>
+        <input x="25" y="-11" size="7" rotation="270" rotate="true" text="X1"/>
+        <input x="-5" y="-12" size="7" rotation="270" rotate="true" text="11"/>
+        <input x="-25" y="-11" size="7" rotation="270" rotate="true" text="21"/>
+        <circle x="-42.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-45" y="49" size="7" rotation="270" rotate="true" text="32"/>
+        <circle x="-42.2361" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="105" y="-10" size="7" rotation="270" rotate="true" text="E1"/>
+        <circle x="107.764" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="77.7639" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="55" y="49" size="7" rotation="270" rotate="true" text="44"/>
+        <input x="25" y="49" size="7" rotation="270" rotate="true" text="X2"/>
+        <input x="75" y="-11" size="7" rotation="270" rotate="true" text="51"/>
+        <input x="55" y="-11" size="7" rotation="270" rotate="true" text="43"/>
+        <input x="-5" y="49" size="7" rotation="270" rotate="true" text="12"/>
+        <input x="-25" y="49" size="7" rotation="270" rotate="true" text="22"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="10" x1="57" y2="10" x2="99"/>
+        <circle x="107.764" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="57.7639" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="27.7639" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="77.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="57.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="27.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-2.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-22.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-2.2361" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-22.2361" y="45.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <rect width="22" x="99" y="2" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="10" x1="-37" y2="10" x2="2"/>
+        <input x="122" y="10.5" size="9" rotate="true" text="XCS-E8511"/>
+        <circle x="20" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.97" x1="37.03" y2="17.03" x2="22.97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.97" x1="22.97" y2="17.03" x2="37.03"/>
+        <terminal x="-40" y="51" orientation="s"/>
+        <terminal x="-40" y="-31" orientation="n"/>
+        <terminal x="-20" y="51" orientation="s"/>
+        <terminal x="0" y="51" orientation="s"/>
+        <terminal x="-20" y="-31" orientation="n"/>
+        <terminal x="0" y="-31" orientation="n"/>
+        <terminal x="30" y="-31" orientation="n"/>
+        <terminal x="60" y="-31" orientation="n"/>
+        <terminal x="80" y="-31" orientation="n"/>
+        <terminal x="30" y="51" orientation="s"/>
+        <terminal x="60" y="51" orientation="s"/>
+        <terminal x="80" y="51" orientation="s"/>
+        <terminal x="110" y="51" orientation="s"/>
+        <terminal x="110" y="-31" orientation="n"/>
     </description>
 </definition>

Modified: branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_1.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_1.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_1.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,34 +1,33 @@
-<definition width="90" version="0.22" hotspot_x="45" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
+<definition width="70" version="0.22" hotspot_x="25" hotspot_y="35" height="70" type="element" ic="true" orientation="dnny">
     <names>
-        <name lang="en" >XCS-DMC</name>
-        <name lang="fr" >XCS-DMC</name>
-        <name lang="pl" >XCS-DMC</name>
-        <name lang="cs" >XCS-DMC</name>
+        <name lang="en">XCS-DMC</name>
+        <name lang="pl">XCS-DMC</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-34" y2="9" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-34" y2="9" x2="-34" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-30" y2="-9" x2="-34" />
-        <line length1="2.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-35" y2="10" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-35" y2="10" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-30" y2="-10" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="22" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-22" y2="8" x2="-22" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="0" y2="0" x2="22" />
-        <polygon x4="-20" y5="0" x5="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-10" y2="-10" x2="-20" y3="0" x3="-30" y4="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-18" y2="8" x2="-18" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="20" y2="-9" x2="26" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-9" x2="20" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="20" y2="10" x2="20" y3="-10" x3="25" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="0" y2="-9" x2="6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
-        <input x="26" y="3.66667" size="9" text="_" />
-        <terminal x="0" y="-20" orientation="n" />
-        <terminal x="0" y="20" orientation="s" />
-        <terminal x="20" y="-20" orientation="n" />
-        <terminal x="20" y="20" orientation="s" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-11" x1="5" y2="10" x2="0" y3="25" x3="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-10" x2="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-10" x2="0"/>
+        <input x="-5.5" y="27" size="5" rotation="270" rotate="true" text="BK"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-11" x1="25" y2="10" x2="20" y3="25" x3="20"/>
+        <input x="14.5" y="-14" size="5" rotation="270" rotate="true" text="BN"/>
+        <input x="14.5" y="27" size="5" rotation="270" rotate="true" text="BU"/>
+        <input x="-5.5" y="-12" size="5" rotation="270" rotate="true" text="WH"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-11" y2="4" x2="-11"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-17" y2="-5" x2="-15"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-9" y2="4" x2="-9"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-17" y2="5" x2="-17"/>
+        <polygon x4="-10" y5="0" x5="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="-5" x2="-10" y3="0" x3="-15" y4="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-5" y2="0" x2="22"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-17" y2="5" x2="-15"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="8" y2="0" x2="30"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="-10" x2="26"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-10" x2="6"/>
+        <input x="26" y="3.66667" size="9" text="_"/>
+        <terminal x="0" y="-30" orientation="n"/>
+        <terminal x="0" y="25" orientation="s"/>
+        <terminal x="20" y="-30" orientation="n"/>
+        <terminal x="20" y="25" orientation="s"/>
     </description>
 </definition>

Modified: branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_2.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_2.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_2.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,33 +1,32 @@
-<definition width="90" version="0.22" hotspot_x="45" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
+<definition width="70" version="0.22" hotspot_x="25" hotspot_y="35" height="70" type="element" ic="true" orientation="dnny">
     <names>
-        <name lang="en" >XCS-DMC</name>
-        <name lang="fr" >XCS-DMC</name>
-        <name lang="pl" >XCS-DMC</name>
-        <name lang="cs" >XCS-DMC</name>
+        <name lang="en">XCS-DMC</name>
+        <name lang="pl">XCS-DMC</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="10" x2="0" y3="-10" x3="-6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-34" y2="9" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-34" y2="9" x2="-34" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-30" y2="-9" x2="-34" />
-        <line length1="2.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-35" y2="10" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-35" y2="10" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-30" y2="-10" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="22" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-22" y2="8" x2="-22" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="0" y2="0" x2="22" />
-        <polygon x4="-20" y5="0" x5="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-10" y2="-10" x2="-20" y3="0" x3="-30" y4="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-18" y2="8" x2="-18" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="20" y2="-9" x2="26" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-9" x2="20" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="20" y2="10" x2="20" y3="-10" x3="25" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
-        <input x="26" y="3.66667" size="9" text="_" />
-        <terminal x="0" y="-20" orientation="n" />
-        <terminal x="0" y="20" orientation="s" />
-        <terminal x="20" y="-20" orientation="n" />
-        <terminal x="20" y="20" orientation="s" />
+        <input x="-5.5" y="32" size="5" rotation="270" rotate="true" text="BK"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-6" y2="10" x2="0" y3="30" x3="0"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-11" x1="25" y2="10" x2="20" y3="30" x3="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-10" x2="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-30" x2="0"/>
+        <input x="14.5" y="-14" size="5" rotation="270" rotate="true" text="BN"/>
+        <input x="-5.5" y="-12" size="5" rotation="270" rotate="true" text="WH"/>
+        <input x="14.5" y="32" size="5" rotation="270" rotate="true" text="BU"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-22" y2="5" x2="-20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-22" y2="-5" x2="-20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-22" y2="5" x2="-22"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-14" y2="4" x2="-14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="22"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-16" y2="4" x2="-16"/>
+        <polygon x4="-15" y5="0" x5="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-10" y2="-5" x2="-15" y3="0" x3="-20" y4="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="22"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="-10" x2="26"/>
+        <input x="26" y="3.66667" size="9" text="_"/>
+        <terminal x="0" y="-30" orientation="n"/>
+        <terminal x="0" y="30" orientation="s"/>
+        <terminal x="20" y="-30" orientation="n"/>
+        <terminal x="20" y="30" orientation="s"/>
     </description>
 </definition>

Modified: branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_3.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_3.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_3.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,40 +1,38 @@
-<definition width="110" version="0.22" hotspot_x="45" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
+<definition width="90" version="0.22" hotspot_x="25" hotspot_y="35" height="70" type="element" ic="true" orientation="dnny">
     <names>
-        <name lang="en" >XCS-DMC</name>
-        <name lang="fr" >XCS-DMC</name>
-        <name lang="pl" >XCS-DMC</name>
-        <name lang="cs" >XCS-DMC</name>
+        <name lang="en">XCS-DMC</name>
+        <name lang="pl">XCS-DMC</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="42" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="22" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="10" x2="0" y3="-10" x3="-6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="0" y2="0" x2="22" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-34" y2="9" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="20" y2="-9" x2="26" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-34" y2="9" x2="-34" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-9" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-30" y2="-9" x2="-34" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="20" y2="10" x2="20" y3="-10" x3="25" />
-        <line length1="2.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-35" y2="10" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-35" y2="10" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-30" y2="-10" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-22" y2="8" x2="-22" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="20" y2="0" x2="42" />
-        <polygon x4="-20" y5="0" x5="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-10" y2="-10" x2="-20" y3="0" x3="-30" y4="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-18" y2="8" x2="-18" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="40" y2="-9" x2="46" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="40" y2="-9" x2="40" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="40" y2="10" x2="40" y3="-10" x3="45" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
-        <input x="46" y="4.66667" size="9" text="_" />
-        <terminal x="0" y="-20" orientation="n" />
-        <terminal x="0" y="20" orientation="s" />
-        <terminal x="40" y="-20" orientation="n" />
-        <terminal x="40" y="20" orientation="s" />
-        <terminal x="20" y="-20" orientation="n" />
-        <terminal x="20" y="20" orientation="s" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="42"/>
+        <input x="-5.5" y="32" size="5" rotation="270" rotate="true" text="PK"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-10" x2="20"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-11" x1="25" y2="10" x2="20" y3="30" x3="20"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-6" y2="10" x2="0" y3="30" x3="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-10" x2="0"/>
+        <input x="34.5" y="-14" size="5" rotation="270" rotate="true" text="BN"/>
+        <input x="14.5" y="-12" size="5" rotation="270" rotate="true" text="WH"/>
+        <input x="-5.5" y="-14" size="5" rotation="270" rotate="true" text="GY"/>
+        <input x="34.5" y="32" size="5" rotation="270" rotate="true" text="BU"/>
+        <input x="14.5" y="32" size="5" rotation="270" rotate="true" text="BK"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="40" y2="-10" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-14" y2="4" x2="-14"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-11" x1="45" y2="10" x2="40" y3="30" x3="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-16" y2="4" x2="-16"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="40" y2="-10" x2="46"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-20" y2="-5" x2="-22"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-22" y2="5" x2="-22"/>
+        <polygon x4="-15" y5="0" x5="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-10" y2="-5" x2="-15" y3="0" x3="-20" y4="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-20" y2="5" x2="-22"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="-10" x2="26"/>
+        <input x="46" y="4.66667" size="9" text="_"/>
+        <terminal x="0" y="-30" orientation="n"/>
+        <terminal x="0" y="30" orientation="s"/>
+        <terminal x="20" y="-30" orientation="n"/>
+        <terminal x="20" y="30" orientation="s"/>
+        <terminal x="40" y="-30" orientation="n"/>
+        <terminal x="40" y="30" orientation="s"/>
     </description>
 </definition>

Modified: branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_4.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_4.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/interrupteurs_securite_magnetiques/xcs_dmc_4.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,36 +1,37 @@
-<definition width="110" version="0.22" hotspot_x="45" hotspot_y="25" height="50" type="element" ic="true" orientation="dnny" >
+<definition width="90" version="0.22" hotspot_x="25" hotspot_y="35" height="70" type="element" ic="true" orientation="dnny">
     <names>
-        <name lang="en" >XCS-DMC</name>
-        <name lang="fr" >XCS-DMC</name>
-        <name lang="pl" >XCS-DMC</name>
-        <name lang="cs" >XCS-DMC</name>
+        <name lang="en">XCS-DMC</name>
+        <name lang="pl">XCS-DMC</name>
     </names>
-    <informations>Author: The QElectroTech team
+    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="42" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="20" y2="10" x2="20" y3="-10" x3="14" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-9" x2="20" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="10" x2="0" y3="-10" x3="-6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-34" y2="9" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-34" y2="9" x2="-34" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-30" y2="-9" x2="-34" />
-        <line length1="2.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-35" y2="10" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-35" y2="10" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-30" y2="-10" x2="-35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-22" y2="8" x2="-22" />
-        <polygon x4="-20" y5="0" x5="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-10" y2="-10" x2="-20" y3="0" x3="-30" y4="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-18" y2="8" x2="-18" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="40" y2="-9" x2="46" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="40" y2="-9" x2="40" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="40" y2="10" x2="40" y3="-10" x3="45" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-9" x2="0" />
-        <input x="46" y="4.66667" size="9" text="_" />
-        <terminal x="20" y="20" orientation="s" />
-        <terminal x="20" y="-20" orientation="n" />
-        <terminal x="0" y="-20" orientation="n" />
-        <terminal x="0" y="20" orientation="s" />
-        <terminal x="40" y="-20" orientation="n" />
-        <terminal x="40" y="20" orientation="s" />
+        <input x="-5.5" y="32" size="5" rotation="270" rotate="true" text="PK"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="42"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-11" x1="45" y2="10" x2="40" y3="30" x3="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="40" y2="-10" x2="40"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-6" y2="10" x2="0" y3="30" x3="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-10" x2="0"/>
+        <input x="34.5" y="-14" size="5" rotation="270" rotate="true" text="BN"/>
+        <input x="14.5" y="-12" size="5" rotation="270" rotate="true" text="WH"/>
+        <input x="-5.5" y="-14" size="5" rotation="270" rotate="true" text="GY"/>
+        <input x="34.5" y="32" size="5" rotation="270" rotate="true" text="BU"/>
+        <input x="14.5" y="32" size="5" rotation="270" rotate="true" text="BK"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="14" y2="10" x2="20" y3="30" x3="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-10" x2="20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-22" y2="-5" x2="-20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-16" y2="4" x2="-16"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-14" y2="4" x2="-14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-22" y2="5" x2="-20"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-22" y2="5" x2="-22"/>
+        <polygon x4="-15" y5="0" x5="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-10" y2="-5" x2="-15" y3="0" x3="-20" y4="5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="40" y2="-10" x2="46"/>
+        <input x="46" y="4.66667" size="9" text="_"/>
+        <terminal x="0" y="-30" orientation="n"/>
+        <terminal x="0" y="30" orientation="s"/>
+        <terminal x="40" y="-30" orientation="n"/>
+        <terminal x="40" y="30" orientation="s"/>
+        <terminal x="20" y="-30" orientation="n"/>
+        <terminal x="20" y="30" orientation="s"/>
     </description>
 </definition>

Copied: branches/0.3/elements/blocs_de_securite/pilz/pilz.elmt (from rev 1060, branches/0.3/elements/blocs_de_securite/pilz.elmt)
===================================================================
--- branches/0.3/elements/blocs_de_securite/pilz/pilz.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/pilz/pilz.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,121 @@
+<definition width="420" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" orientation="dyyy" >
+    <names>
+        <name lang="ru" >Модуль безопасности PILZ</name>
+        <name lang="en" >Safety module PILZ</name>
+        <name lang="fr" >Relais autocontrolé PILZ</name>
+        <name lang="pl" >Przekaźnik bezpieczeństwa PILZ</name>
+        <name lang="cs" >Automaticky řízené relé PILZ</name>
+    </names>
+    <informations></informations>
+    <description>
+        <rect width="400" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="41" x1="280" y2="30" x2="280" y3="20" x3="275" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="41" x1="320" y2="30" x2="320" y3="20" x3="315" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="21" x1="320" y2="10" x2="320" y3="0" x3="315" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="21" x1="279" y2="10" x2="279" y3="0" x3="274" />
+        <polygon x4="325" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="69" x1="320" y2="49" x2="320" y3="40" x3="325" y4="40" />
+        <polygon x4="285" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="69" x1="280" y2="49" x2="280" y3="40" x3="285" y4="40" />
+        <polygon x4="186" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="21" x1="190" y2="10" x2="190" y3="0" x3="186" y4="0" />
+        <polygon x4="97" y5="0" x5="97" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="91" y2="20" x2="101" y3="10" x3="101" y4="0" />
+        <polygon x4="156" y5="0" x5="156" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="150" y2="20" x2="160" y3="10" x3="160" y4="0" />
+        <polygon x4="146" y5="0" x5="146" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="39" x1="150" y2="19" x2="150" y3="10" x3="150" y4="0" />
+        <polygon x4="86" y5="0" x5="86" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="39" x1="90" y2="19" x2="90" y3="10" x3="90" y4="0" />
+        <rect width="12" x="144" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="198" y="26" size="4" text="RB" />
+        <text x="163" y="6" size="4" text="RC" />
+        <text x="104" y="6" size="4" text="RC" />
+        <text x="76" y="5" size="4" text="RA" />
+        <text x="136" y="5" size="4" text="RA" />
+        <text x="194" y="5" size="4" text="RA" />
+        <rect width="12" x="184" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="187" y="47" size="4" text="RC" />
+        <text x="147" y="47" size="4" text="RB" />
+        <text x="87" y="47" size="4" text="RA" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="219" y2="51" x2="219" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="190" y2="56" x2="190" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="150" y2="56" x2="150" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="90" y2="56" x2="90" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="34" x1="218" y2="39" x2="218" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="34" x1="191" y2="34" x2="218" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="-50" y2="56" x2="218" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-50" y2="56" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="190" y2="40" x2="190" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="161" y2="-1" x2="161" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="151" y2="-6" x2="160" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="101" y2="-1" x2="101" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="91" y2="-6" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="210" y2="50" x2="227" />
+        <rect width="16" x="210" y="40" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <rect width="12" x="84" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="190" y2="21" x2="195" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-50" y2="-3" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="190" y2="20" x2="194" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-50" y2="-3" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="150" y2="70" x2="150" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="20" y2="65" x2="150" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="64" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="24" x1="278" y2="24" x2="317" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="5" x1="278" y2="5" x2="317" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="45" x1="283" y2="45" x2="322" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="190.375" y2="0" x2="190.375" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="150.375" y2="0" x2="150.375" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="90.375" y2="-1" x2="90.375" />
+        <text x="328" y="49" size="4" text="RC" />
+        <text x="265" y="48" size="4" text="RC" />
+        <text x="327" y="7" size="4" text="RA" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="320" y2="41" x2="325" />
+        <text x="328" y="26" size="4" text="RB" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="280" y2="41" x2="285" />
+        <text x="202" y="84" size="8" text="X" />
+        <text x="312" y="-16" size="8" text="S3" />
+        <text x="312" y="84" size="8" text="S4" />
+        <text x="272" y="-17" size="8" text="S1" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="240" y2="-29" x2="240" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="290" y2="-29" x2="290" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="270" y2="-29" x2="270" />
+        <text x="143" y="-18" size="8" text="E2" />
+        <text x="142" y="84" size="8" text="C" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="330" y2="-29" x2="330" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="320.375" y2="0" x2="320.375" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="330" y2="89" x2="330" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="310" y2="-29" x2="310" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="310" y2="89" x2="310" />
+        <text x="13" y="-18" size="8" text="C" />
+        <text x="82" y="-18" size="8" text="E1" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="80" y2="-11" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="100" y2="-11" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="30" y2="-11" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="10" y2="-11" x2="10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-29" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="140" y2="-29" x2="140" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="160" y2="-29" x2="160" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="89" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="90" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="160" y2="89" x2="160" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="140" y2="89" x2="140" />
+        <text x="273" y="83" size="8" text="S2" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="290" y2="89" x2="290" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="270" y2="89" x2="270" />
+        <text x="-57" y="82.6667" size="8" text="A2" />
+        <text x="-57" y="-18" size="8" text="24" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="89" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-40" y2="-29" x2="-40" />
+        <text x="264" y="6" size="4" text="RA" />
+        <text x="265" y="25" size="4" text="RB" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.5" x1="-59.0625" y2="-10.5" x2="340" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="340" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="280.375" y2="0" x2="280.375" />
+        <terminal x="210" y="94" orientation="s" />
+        <terminal x="280" y="-34" orientation="n" />
+        <terminal x="280" y="94.3333" orientation="s" />
+        <terminal x="320" y="-34" orientation="n" />
+        <terminal x="320" y="95" orientation="s" />
+        <terminal x="-50" y="-34" orientation="n" />
+        <terminal x="-50" y="94" orientation="s" />
+        <terminal x="150" y="94" orientation="s" />
+        <terminal x="150" y="-34" orientation="n" />
+        <terminal x="230" y="-34" orientation="n" />
+        <terminal x="20" y="-34" orientation="n" />
+        <terminal x="90" y="-34" orientation="n" />
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/pilz/qet_directory
===================================================================
--- branches/0.3/elements/blocs_de_securite/pilz/qet_directory	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/pilz/qet_directory	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,7 @@
+<qet-directory>
+    <names>
+	<name lang="en" >Pilz</name>
+        <name lang="fr" >Pilz</name>
+        <name lang="pl" >Pilz</name>
+    </names>
+</qet-directory>

Deleted: branches/0.3/elements/blocs_de_securite/pilz.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/pilz.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/pilz.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,121 +0,0 @@
-<definition width="420" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" orientation="dyyy" >
-    <names>
-        <name lang="ru" >Модуль безопасности PILZ</name>
-        <name lang="en" >Safety module PILZ</name>
-        <name lang="fr" >Relais autocontrolé PILZ</name>
-        <name lang="pl" >Przekaźnik bezpieczeństwa PILZ</name>
-        <name lang="cs" >Automaticky řízené relé PILZ</name>
-    </names>
-    <informations></informations>
-    <description>
-        <rect width="400" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="41" x1="280" y2="30" x2="280" y3="20" x3="275" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="41" x1="320" y2="30" x2="320" y3="20" x3="315" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="21" x1="320" y2="10" x2="320" y3="0" x3="315" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="21" x1="279" y2="10" x2="279" y3="0" x3="274" />
-        <polygon x4="325" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="69" x1="320" y2="49" x2="320" y3="40" x3="325" y4="40" />
-        <polygon x4="285" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="69" x1="280" y2="49" x2="280" y3="40" x3="285" y4="40" />
-        <polygon x4="186" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="21" x1="190" y2="10" x2="190" y3="0" x3="186" y4="0" />
-        <polygon x4="97" y5="0" x5="97" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="91" y2="20" x2="101" y3="10" x3="101" y4="0" />
-        <polygon x4="156" y5="0" x5="156" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="150" y2="20" x2="160" y3="10" x3="160" y4="0" />
-        <polygon x4="146" y5="0" x5="146" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="39" x1="150" y2="19" x2="150" y3="10" x3="150" y4="0" />
-        <polygon x4="86" y5="0" x5="86" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="39" x1="90" y2="19" x2="90" y3="10" x3="90" y4="0" />
-        <rect width="12" x="144" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="198" y="26" size="4" text="RB" />
-        <text x="163" y="6" size="4" text="RC" />
-        <text x="104" y="6" size="4" text="RC" />
-        <text x="76" y="5" size="4" text="RA" />
-        <text x="136" y="5" size="4" text="RA" />
-        <text x="194" y="5" size="4" text="RA" />
-        <rect width="12" x="184" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="187" y="47" size="4" text="RC" />
-        <text x="147" y="47" size="4" text="RB" />
-        <text x="87" y="47" size="4" text="RA" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="219" y2="51" x2="219" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="190" y2="56" x2="190" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="150" y2="56" x2="150" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="90" y2="56" x2="90" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="34" x1="218" y2="39" x2="218" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="34" x1="191" y2="34" x2="218" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="-50" y2="56" x2="218" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-50" y2="56" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="190" y2="40" x2="190" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="161" y2="-1" x2="161" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="151" y2="-6" x2="160" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="101" y2="-1" x2="101" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="91" y2="-6" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="210" y2="50" x2="227" />
-        <rect width="16" x="210" y="40" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="12" x="84" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="190" y2="21" x2="195" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-50" y2="-3" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="190" y2="20" x2="194" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-50" y2="-3" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="150" y2="70" x2="150" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="20" y2="65" x2="150" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="64" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="24" x1="278" y2="24" x2="317" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="5" x1="278" y2="5" x2="317" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="45" x1="283" y2="45" x2="322" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="190.375" y2="0" x2="190.375" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="150.375" y2="0" x2="150.375" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="90.375" y2="-1" x2="90.375" />
-        <text x="328" y="49" size="4" text="RC" />
-        <text x="265" y="48" size="4" text="RC" />
-        <text x="327" y="7" size="4" text="RA" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="320" y2="41" x2="325" />
-        <text x="328" y="26" size="4" text="RB" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="280" y2="41" x2="285" />
-        <text x="202" y="84" size="8" text="X" />
-        <text x="312" y="-16" size="8" text="S3" />
-        <text x="312" y="84" size="8" text="S4" />
-        <text x="272" y="-17" size="8" text="S1" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="240" y2="-29" x2="240" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="290" y2="-29" x2="290" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="270" y2="-29" x2="270" />
-        <text x="143" y="-18" size="8" text="E2" />
-        <text x="142" y="84" size="8" text="C" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="330" y2="-29" x2="330" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="320.375" y2="0" x2="320.375" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="330" y2="89" x2="330" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="310" y2="-29" x2="310" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="310" y2="89" x2="310" />
-        <text x="13" y="-18" size="8" text="C" />
-        <text x="82" y="-18" size="8" text="E1" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="80" y2="-11" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="100" y2="-11" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="30" y2="-11" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="10" y2="-11" x2="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-29" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="140" y2="-29" x2="140" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="160" y2="-29" x2="160" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="89" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="90" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="160" y2="89" x2="160" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="140" y2="89" x2="140" />
-        <text x="273" y="83" size="8" text="S2" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="290" y2="89" x2="290" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="270" y2="89" x2="270" />
-        <text x="-57" y="82.6667" size="8" text="A2" />
-        <text x="-57" y="-18" size="8" text="24" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="89" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-40" y2="-29" x2="-40" />
-        <text x="264" y="6" size="4" text="RA" />
-        <text x="265" y="25" size="4" text="RB" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.5" x1="-59.0625" y2="-10.5" x2="340" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="340" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="280.375" y2="0" x2="280.375" />
-        <terminal x="210" y="94" orientation="s" />
-        <terminal x="280" y="-34" orientation="n" />
-        <terminal x="280" y="94.3333" orientation="s" />
-        <terminal x="320" y="-34" orientation="n" />
-        <terminal x="320" y="95" orientation="s" />
-        <terminal x="-50" y="-34" orientation="n" />
-        <terminal x="-50" y="94" orientation="s" />
-        <terminal x="150" y="94" orientation="s" />
-        <terminal x="150" y="-34" orientation="n" />
-        <terminal x="230" y="-34" orientation="n" />
-        <terminal x="20" y="-34" orientation="n" />
-        <terminal x="90" y="-34" orientation="n" />
-    </description>
-</definition>

Added: branches/0.3/elements/blocs_de_securite/preventa/preventa_2/qet_directory
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/preventa_2/qet_directory	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/preventa_2/qet_directory	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,7 @@
+<qet-directory>
+    <names>
+	<name lang="en" >Preventa_2</name>
+        <name lang="fr" >Preventa_2</name>
+        <name lang="pl" >Preventa_2</name>
+    </names>
+</qet-directory>

Added: branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_ac.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_ac.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_ac.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,88 @@
+<definition width="210" version="0.22" hotspot_x="70" hotspot_y="40" height="110" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">XPS-AC</name>
+        <name lang="fr">XPS-AC</name>
+        <name lang="pl">XPS-AC</name>
+        <name lang="cs">XPS-AC</name>
+    </names>
+    <informations>TELEMECANIQUE</informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-25" x1="110" y2="5" x2="110" y3="12" x3="100"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="80" y2="-10" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="60" y2="-10" x2="60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="40" y2="-10" x2="40"/>
+        <input x="-55" y="14.5" size="9" rotate="true" text="XPS-AC"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="113" y2="-28" x2="129"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="84" y2="-28" x2="108"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="63" y2="-28" x2="77"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="43" y2="-28" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="23" y2="-28" x2="37"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="130" y2="58" x2="130"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="113" y2="58" x2="130"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="84" y2="58" x2="108"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="63" y2="58" x2="77"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="43" y2="58" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-16" y2="58" x2="38"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-37" y2="58" x2="-23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="58" x2="-60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-60" y2="58" x2="-43"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-37" y2="-28" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="3" y2="-28" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="-43"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="110" y2="28" x2="110" y3="18" x3="100"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="40" y2="40" x2="40" y3="20" x3="35"/>
+        <input x="-40" y="-10" size="7" rotation="270" rotate="true" text="A1"/>
+        <input x="35" y="-11" size="7" rotation="270" rotate="true" text="13"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="80" y2="40" x2="80" y3="20" x3="75"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="60" y2="40" x2="60" y3="20" x3="55"/>
+        <input x="35" y="59" size="7" rotation="270" rotate="true" text="14"/>
+        <input x="20" y="-9" size="7" rotation="270" rotate="true" text="Y2"/>
+        <input x="0" y="-9" size="7" rotation="270" rotate="true" text="Y1"/>
+        <input x="-19" y="59" size="7" rotation="270" rotate="true" text="PE"/>
+        <input x="-39" y="59" size="7" rotation="270" rotate="true" text="A2"/>
+        <circle x="-42.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-42.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <text x="-13" y="2.33333" size="5" text="K1"/>
+        <input x="105" y="-4" size="7" rotation="270" rotate="true" text="Y43"/>
+        <input x="75" y="-11" size="7" rotation="270" rotate="true" text="33"/>
+        <input x="55" y="-11" size="7" rotation="270" rotate="true" text="23"/>
+        <circle x="37.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="105" y="59" size="7" rotation="270" rotate="true" text="Y44"/>
+        <input x="75" y="59" size="7" rotation="270" rotate="true" text="34"/>
+        <input x="55" y="59" size="7" rotation="270" rotate="true" text="24"/>
+        <circle x="37.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="17.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-2.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-22.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="107.764" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="77.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="57.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="107.764" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="77.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="57.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <text x="-13" y="32.3333" size="5" text="K2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="30" x1="21" y2="30" x2="77"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="21" y2="0" x2="77"/>
+        <rect width="22" x="-1" y="22" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="22" x="-1" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="110" antialias="true" style="line-style:normal;line-weight:thin;filling:black;color:black" y1="28" x1="110" y2="23" x2="108" y3="26" x3="105" y4="28"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="55" y2="10" x2="60" y3="20" x3="60"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="75" y2="10" x2="80" y3="20" x3="80"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="35" y2="10" x2="40" y3="20" x3="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="100" y2="15" x2="90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="100" y2="20" x2="100"/>
+        <terminal x="-40" y="61" orientation="s"/>
+        <terminal x="-40" y="-31" orientation="n"/>
+        <terminal x="-20" y="61" orientation="s"/>
+        <terminal x="0" y="-31" orientation="n"/>
+        <terminal x="20" y="-31" orientation="n"/>
+        <terminal x="40" y="61" orientation="s"/>
+        <terminal x="60" y="61" orientation="s"/>
+        <terminal x="80" y="61" orientation="s"/>
+        <terminal x="110" y="61" orientation="s"/>
+        <terminal x="40" y="-31" orientation="n"/>
+        <terminal x="60" y="-31" orientation="n"/>
+        <terminal x="80" y="-31" orientation="n"/>
+        <terminal x="110" y="-31" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_af.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_af.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_af.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,91 @@
+<definition width="200" version="0.22" hotspot_x="70" hotspot_y="40" height="110" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">XPS-AF</name>
+        <name lang="fr">XPS-AF</name>
+        <name lang="pl">XPS-AF</name>
+        <name lang="cs">XPS-AF</name>
+    </names>
+    <informations>TELEMECANIQUE</informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="100" y2="-25" x2="100"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="80" y2="-25" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="60" y2="-25" x2="60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="120" y2="58" x2="120"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-37" y2="-28" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="103" y2="58" x2="120"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="3" y2="-28" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="103" y2="-28" x2="120"/>
+        <circle x="97.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="77.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-42.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="0" y="-5" size="7" rotation="270" rotate="true" text="S33"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="83" y2="-28" x2="97"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="100" y2="40" x2="100" y3="20" x3="95"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="80" y2="40" x2="80" y3="20" x3="75"/>
+        <circle x="-22.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-2.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="63" y2="-28" x2="77"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="83" y2="58" x2="97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="63" y2="58" x2="77"/>
+        <circle x="-2.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="43" y2="-28" x2="57"/>
+        <input x="95" y="59" size="7" rotation="270" rotate="true" text="34"/>
+        <input x="75" y="59" size="7" rotation="270" rotate="true" text="24"/>
+        <circle x="57.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="23" y2="-28" x2="37"/>
+        <circle x="17.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="37.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="60" y2="40" x2="60" y3="20" x3="55"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="43" y2="58" x2="57"/>
+        <input x="55" y="-11" size="7" rotation="270" rotate="true" text="13"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="23" y2="58" x2="37"/>
+        <input x="40" y="-5" size="7" rotation="270" rotate="true" text="S39"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="3" y2="58" x2="17"/>
+        <input x="20" y="-5" size="7" rotation="270" rotate="true" text="S34"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-17" y2="58" x2="-3"/>
+        <input x="95" y="-11" size="7" rotation="270" rotate="true" text="33"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-37" y2="58" x2="-23"/>
+        <input x="75" y="-11" size="7" rotation="270" rotate="true" text="23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="-43"/>
+        <circle x="57.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="37.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="55" y="59" size="7" rotation="270" rotate="true" text="14"/>
+        <circle x="17.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="40" y="59" size="7" rotation="270" rotate="true" text="S22"/>
+        <circle x="97.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="20" y="59" size="7" rotation="270" rotate="true" text="S21"/>
+        <circle x="77.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="0" y="59" size="7" rotation="270" rotate="true" text="S12"/>
+        <input x="-20" y="59" size="7" rotation="270" rotate="true" text="S11"/>
+        <input x="-40" y="-10" size="7" rotation="270" rotate="true" text="A1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="58" x2="-60"/>
+        <circle x="-42.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-60" y2="58" x2="-43"/>
+        <input x="-40" y="59" size="7" rotation="270" rotate="true" text="A2"/>
+        <text x="7" y="2.33333" size="5" text="K1"/>
+        <text x="-50" y="19" size="9" text="XPS-AF"/>
+        <text x="7" y="32.3333" size="5" text="K2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="30" x1="41" y2="30" x2="97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="41" y2="0" x2="97"/>
+        <rect width="22" x="19" y="22" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="22" x="19" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="75" y2="10" x2="80" y3="20" x3="80"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="95" y2="10" x2="100" y3="20" x3="100"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="55" y2="10" x2="60" y3="20" x3="60"/>
+        <terminal x="-40" y="61" orientation="s"/>
+        <terminal x="-40" y="-31" orientation="n"/>
+        <terminal x="-20" y="61" orientation="s"/>
+        <terminal x="0" y="61" orientation="s"/>
+        <terminal x="20" y="61" orientation="s"/>
+        <terminal x="60" y="61" orientation="s"/>
+        <terminal x="40" y="61" orientation="s"/>
+        <terminal x="80" y="61" orientation="s"/>
+        <terminal x="100" y="61" orientation="s"/>
+        <terminal x="20" y="-31" orientation="n"/>
+        <terminal x="40" y="-31" orientation="n"/>
+        <terminal x="60" y="-31" orientation="n"/>
+        <terminal x="80" y="-31" orientation="n"/>
+        <terminal x="100" y="-31" orientation="n"/>
+        <terminal x="0" y="-31" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_afl.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_afl.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_afl.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,95 @@
+<definition width="220" version="0.22" hotspot_x="70" hotspot_y="40" height="110" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">XPS-AFL</name>
+        <name lang="fr">XPS-AFL</name>
+        <name lang="pl">XPS-AFL</name>
+        <name lang="cs">XPS-AFL</name>
+    </names>
+    <informations>TELEMECANIQUE</informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="120" y2="-10" x2="120"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="100" y2="-10" x2="100"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="80" y2="-10" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="140" y2="58" x2="140"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="123" y2="58" x2="140"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="120" y2="40" x2="120" y3="20" x3="115"/>
+        <circle x="-42.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-37" y2="-28" x2="17"/>
+        <circle x="117.764" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="100" y2="40" x2="100" y3="20" x3="95"/>
+        <circle x="-22.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="23" y2="-28" x2="37"/>
+        <circle x="97.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="80" y2="40" x2="80" y3="20" x3="75"/>
+        <circle x="-2.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="123" y2="-28" x2="140"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="103" y2="58" x2="117"/>
+        <text x="27" y="2.33333" size="5" text="K1"/>
+        <circle x="17.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="20" y="-5" size="7" rotation="270" rotate="true" text="S33"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="83" y2="58" x2="97"/>
+        <text x="27" y="32.3333" size="5" text="K2"/>
+        <circle x="37.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="103" y2="-28" x2="117"/>
+        <input x="115.5" y="59" size="5" rotation="270" rotate="true" text="34"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="30" x1="61" y2="30" x2="117"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="43" y2="58" x2="57"/>
+        <circle x="17.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="95.5" y="59" size="5" rotation="270" rotate="true" text="24"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="61" y2="0" x2="117"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="23" y2="58" x2="37"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="83" y2="-28" x2="97"/>
+        <circle x="77.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <rect width="22" x="39" y="22" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="3" y2="58" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="63" y2="-28" x2="77"/>
+        <circle x="57.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <rect width="22" x="39" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-17" y2="58" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="43" y2="-28" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="63" y2="58" x2="77"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="95" y2="10" x2="100" y3="20" x3="100"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-37" y2="58" x2="-23"/>
+        <input x="75" y="59" size="7" rotation="270" rotate="true" text="14"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="115" y2="10" x2="120" y3="20" x3="120"/>
+        <input x="40" y="59" size="7" rotation="270" rotate="true" text="S11"/>
+        <input x="60" y="59" size="7" rotation="270" rotate="true" text="S22"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="75" y2="10" x2="80" y3="20" x3="80"/>
+        <input x="20" y="59" size="7" rotation="270" rotate="true" text="S12"/>
+        <input x="0" y="59" size="7" rotation="270" rotate="true" text="S12"/>
+        <input x="75" y="-11" size="7" rotation="270" rotate="true" text="13"/>
+        <input x="-20" y="59" size="7" rotation="270" rotate="true" text="S11"/>
+        <input x="60" y="-5" size="7" rotation="270" rotate="true" text="S39"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="58" x2="-60"/>
+        <input x="40" y="-5" size="7" rotation="270" rotate="true" text="S34"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-60" y2="58" x2="-43"/>
+        <input x="115" y="-11" size="7" rotation="270" rotate="true" text="33"/>
+        <input x="-40" y="59" size="7" rotation="270" rotate="true" text="A2"/>
+        <input x="95" y="-11" size="7" rotation="270" rotate="true" text="23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="-43"/>
+        <circle x="77.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="57.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="37.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="117.764" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="97.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-40" y="-10" size="7" rotation="270" rotate="true" text="A1"/>
+        <circle x="-42.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <text x="-51" y="19" size="9" text="XPS-AFL"/>
+        <terminal x="-40" y="61" orientation="s"/>
+        <terminal x="-20" y="61" orientation="s"/>
+        <terminal x="0" y="61" orientation="s"/>
+        <terminal x="20" y="61" orientation="s"/>
+        <terminal x="40" y="61" orientation="s"/>
+        <terminal x="80" y="61" orientation="s"/>
+        <terminal x="60" y="61" orientation="s"/>
+        <terminal x="100" y="61" orientation="s"/>
+        <terminal x="120" y="61" orientation="s"/>
+        <terminal x="-40" y="-31" orientation="n"/>
+        <terminal x="40" y="-31" orientation="n"/>
+        <terminal x="60" y="-31" orientation="n"/>
+        <terminal x="80" y="-31" orientation="n"/>
+        <terminal x="100" y="-31" orientation="n"/>
+        <terminal x="120" y="-31" orientation="n"/>
+        <terminal x="20" y="-31" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_al.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_al.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_al.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,64 @@
+<definition width="160" version="0.22" hotspot_x="70" hotspot_y="40" height="110" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">XPS-AL</name>
+        <name lang="fr">XPS-AL</name>
+        <name lang="pl">XPS-AL</name>
+        <name lang="cs">XPS-AL</name>
+    </names>
+    <informations>TELEMECANIQUE</informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="40" y2="-10" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="60" y2="-10" x2="60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="80" y2="58" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="63" y2="58" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="63" y2="-28" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="57.6667" x1="43" y2="57.6667" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-16" y2="58" x2="38"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="54.6667" x1="40" y2="39.6667" x2="40" y3="19.6667" x3="35"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="43" y2="-28" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-37" y2="58" x2="-23"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="54.6667" x1="60" y2="39.6667" x2="60" y3="19.6667" x3="55"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="23" y2="-28" x2="37"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="58" x2="-60"/>
+        <input x="35" y="59" size="7" rotation="270" rotate="true" text="14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-37" y2="-28" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-60" y2="58" x2="-43"/>
+        <text x="-13" y="2" size="5" text="K1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="3" y2="-28" x2="17"/>
+        <input x="-20" y="59" size="7" rotation="270" rotate="true" text="PE"/>
+        <input x="55" y="58" size="7" rotation="270" rotate="true" text="24"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="-43"/>
+        <input x="-40" y="59" size="7" rotation="270" rotate="true" text="A2"/>
+        <circle x="37.7639" y="55.4306" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-42.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="57.7639" y="55.4306" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-40" y="-10" size="7" rotation="270" rotate="true" text="A1"/>
+        <circle x="-22.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <text x="-13" y="32" size="5" text="K2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="29.6667" x1="21" y2="29.6667" x2="77"/>
+        <input x="35" y="-11" size="7" rotation="270" rotate="true" text="13"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-0.33333" x1="21" y2="-0.33333" x2="77"/>
+        <input x="20" y="-9" size="7" rotation="270" rotate="true" text="Y2"/>
+        <rect width="22" x="-1" y="21.6667" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="0" y="-9" size="7" rotation="270" rotate="true" text="Y1"/>
+        <rect width="22" x="-1" y="-8.33333" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-42.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10.3333" x1="55" y2="9.66667" x2="60" y3="19.6667" x3="60"/>
+        <input x="55" y="-11" size="7" rotation="270" rotate="true" text="23"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10.3333" x1="35" y2="9.66667" x2="40" y3="19.6667" x3="40"/>
+        <circle x="37.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="17.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-2.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="57.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <text x="-51" y="19" size="9" text="XPS-AL"/>
+        <terminal x="-40" y="61" orientation="s"/>
+        <terminal x="-20" y="61" orientation="s"/>
+        <terminal x="-40" y="-31" orientation="n"/>
+        <terminal x="0" y="-31" orientation="n"/>
+        <terminal x="20" y="-31" orientation="n"/>
+        <terminal x="40" y="-31" orientation="n"/>
+        <terminal x="60" y="-31" orientation="n"/>
+        <terminal x="40" y="61" orientation="s"/>
+        <terminal x="60" y="61" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_asf.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_asf.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_asf.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,138 @@
+<definition width="360" version="0.22" hotspot_x="70" hotspot_y="40" height="110" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">XPS-ASF</name>
+        <name lang="fr">XPS-ASF</name>
+        <name lang="pl">XPS-ASF</name>
+        <name lang="cs">XPS-ASF</name>
+    </names>
+    <informations>TELEMECANIQUE</informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="280" y2="58" x2="280"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="263" y2="58" x2="280"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="223" y2="58" x2="257"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="163" y2="58" x2="217"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="223" y2="-28" x2="280"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="163" y2="-28" x2="217"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="220" y2="28" x2="220" y3="18" x3="210"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-25" x1="220" y2="2" x2="220" y3="12" x3="210"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="260" y2="55" x2="260"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="30" x1="122" y2="30" x2="157"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="121" y2="0" x2="157"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-17" y2="58" x2="37"/>
+        <input x="215" y="59" size="7" rotation="270" rotate="true" text="Y33/43"/>
+        <input x="255" y="59" size="7" rotation="270" rotate="true" text="Y44"/>
+        <circle x="257.764" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="217.764" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="157.764" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="143" y2="-28" x2="157"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="63" y2="-28" x2="77"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="3" y2="-28" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-17" y2="-28" x2="-3"/>
+        <circle x="37.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-37" y2="58" x2="-23"/>
+        <input x="215" y="-4" size="7" rotation="270" rotate="true" text="Y34"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55.6667" x1="160" y2="40.6667" x2="160" y3="20.6667" x3="155"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="123" y2="-28" x2="137"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="83" y2="-28" x2="97"/>
+        <input x="-20" y="-6" size="7" rotation="270" rotate="true" text="S11"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="23" y2="-28" x2="37"/>
+        <circle x="57.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="58" x2="-60"/>
+        <circle x="217.764" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55.6667" x1="140" y2="40.6667" x2="140" y3="20.6667" x3="135"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="143" y2="58" x2="157"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="140" y2="-10" x2="140"/>
+        <input x="80" y="-10" size="7" rotation="270" rotate="true" text="B1"/>
+        <circle x="-22.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="20" y="8" size="7" rotation="270" rotate="true" text="S21/31"/>
+        <circle x="77.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-60" y2="58" x2="-43"/>
+        <text x="87" y="3" size="5" text="K1"/>
+        <input x="155" y="59" size="7" rotation="270" rotate="true" text="24"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="160" y2="-10" x2="160"/>
+        <circle x="77.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-37" y2="-28" x2="-23"/>
+        <circle x="17.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="97.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-20" y="59" size="7" rotation="270" rotate="true" text="PE"/>
+        <text x="87" y="33" size="5" text="K2"/>
+        <circle x="137.764" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="135" y="-11" size="7" rotation="270" rotate="true" text="13"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="103" y2="-28" x2="117"/>
+        <input x="0" y="-5" size="7" rotation="270" rotate="true" text="S12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="43" y2="-28" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="103" y2="58" x2="117"/>
+        <input x="-40" y="59" size="7" rotation="270" rotate="true" text="A2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="123" y2="58" x2="137"/>
+        <input x="155" y="-11" size="7" rotation="270" rotate="true" text="23"/>
+        <input x="120" y="-9" size="7" rotation="270" rotate="true" text="Y2"/>
+        <circle x="-2.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="60" y="-5" size="7" rotation="270" rotate="true" text="S32"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="83" y2="58" x2="97"/>
+        <circle x="-42.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <rect width="22" x="99" y="22.6667" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="135" y="59" size="7" rotation="270" rotate="true" text="14"/>
+        <circle x="137.764" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="100" y="-9" size="7" rotation="270" rotate="true" text="Y1"/>
+        <input x="40" y="-5" size="7" rotation="270" rotate="true" text="S22"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="63" y2="58" x2="77"/>
+        <circle x="-22.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <rect width="22" x="99" y="-7.33333" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="157.764" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="117.764" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="-43"/>
+        <circle x="117.764" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9.33333" x1="155" y2="10.6667" x2="160" y3="20.6667" x3="160"/>
+        <circle x="97.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="57.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="43" y2="58" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="250" y2="-10" x2="260"/>
+        <circle x="37.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="250" y2="40" x2="221"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9.33333" x1="135" y2="10.6667" x2="140" y3="20.6667" x3="140"/>
+        <input x="-40" y="-10" size="7" rotation="270" rotate="true" text="A1"/>
+        <circle x="-42.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="100" y="59" size="7" rotation="270" rotate="true" text="Y4"/>
+        <input x="120" y="59" size="7" rotation="270" rotate="true" text="S34"/>
+        <input x="80" y="59" size="7" rotation="270" rotate="true" text="Y3"/>
+        <input x="60" y="59" size="7" rotation="270" rotate="true" text="S42"/>
+        <input x="40" y="59" size="7" rotation="270" rotate="true" text="S33/41"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="18" x1="240" y2="28" x2="250" y3="40" x3="250"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="240" y2="15" x2="230"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="210" y2="15" x2="200"/>
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="240" y2="2" x2="250" y3="-10" x3="250"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="240" y2="20" x2="240"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="210" y2="20" x2="210"/>
+        <polygon x4="250" antialias="false" style="line-style:normal;line-weight:thin;filling:black;color:black" y1="2" x1="250" y2="4" x2="245" y3="7" x3="248" y4="2"/>
+        <text x="177" y="37" size="5" text="Sicherung"/>
+        <text x="177" y="31" size="5" text="Power OK"/>
+        <text x="177" y="25" size="5" text="Fusible"/>
+        <text x="189" y="13.3333" size="5" text="A1/A2"/>
+        <text x="219" y="13.3333" size="5" text="K1/K2"/>
+        <polygon x4="220" antialias="false" style="line-style:normal;line-weight:thin;filling:black;color:black" y1="2" x1="220" y2="4" x2="215" y3="7" x3="218" y4="2"/>
+        <text x="-51" y="19" size="9" text="XPS-ASF"/>
+        <terminal x="-40" y="61" orientation="s"/>
+        <terminal x="-20" y="61" orientation="s"/>
+        <terminal x="40" y="61" orientation="s"/>
+        <terminal x="60" y="61" orientation="s"/>
+        <terminal x="80" y="61" orientation="s"/>
+        <terminal x="100" y="61" orientation="s"/>
+        <terminal x="120" y="61" orientation="s"/>
+        <terminal x="-40" y="-31" orientation="n"/>
+        <terminal x="40" y="-31" orientation="n"/>
+        <terminal x="60" y="-30" orientation="n"/>
+        <terminal x="20" y="-31" orientation="n"/>
+        <terminal x="0" y="-31" orientation="n"/>
+        <terminal x="-20" y="-31" orientation="n"/>
+        <terminal x="100" y="-30" orientation="n"/>
+        <terminal x="120" y="-30" orientation="n"/>
+        <terminal x="80" y="-30" orientation="n"/>
+        <terminal x="140" y="-30" orientation="n"/>
+        <terminal x="160" y="-30" orientation="n"/>
+        <terminal x="140" y="60" orientation="s"/>
+        <terminal x="160" y="60" orientation="s"/>
+        <terminal x="220" y="60" orientation="s"/>
+        <terminal x="260" y="60" orientation="s"/>
+        <terminal x="220" y="-30" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_ba.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_ba.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_ba.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,63 @@
+<definition width="170" version="0.22" hotspot_x="70" hotspot_y="40" height="110" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">XPS-BA</name>
+        <name lang="fr">XPS-BA</name>
+        <name lang="pl">XPS-BA</name>
+        <name lang="cs">XPS-BA</name>
+    </names>
+    <informations>TELEMECANIQUE</informations>
+    <description>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-25" x1="60" y2="0" x2="60" y3="21" x3="55"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="63" y2="-28" x2="89"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="44" y2="58" x2="68"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-37" y2="58" x2="37"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="70" y2="55" x2="70"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="60" y2="40" x2="60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="40" y2="55" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="50" y2="40" x2="50"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="90" y2="58" x2="90"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="58" x2="-60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="56" y2="20" x2="50"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="73" y2="58" x2="90"/>
+        <circle x="67.764" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="3" y2="-28" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-60" y2="58" x2="-43"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-17" y2="-28" x2="-3"/>
+        <input x="-40" y="58" size="7" rotation="270" rotate="true" text="A2"/>
+        <input x="65" y="59" size="7" rotation="270" rotate="true" text="14"/>
+        <input x="-20" y="-7" size="7" rotation="270" rotate="true" text="T11"/>
+        <circle x="-42.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="37.764" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="23" y2="-28" x2="37"/>
+        <circle x="-22.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="35" y="59" size="7" rotation="270" rotate="true" text="12"/>
+        <input x="20" y="-6" size="7" rotation="270" rotate="true" text="T12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="60" y2="40" x2="70"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-37" y2="-28" x2="-23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="10" x1="41" y2="10" x2="57"/>
+        <circle x="17.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="40" y2="40" x2="50"/>
+        <input x="0" y="-7" size="7" rotation="270" rotate="true" text="T11"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="43" y2="-28" x2="57"/>
+        <circle x="-2.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="55" y="-12" size="7" rotation="270" rotate="true" text="11"/>
+        <input x="40" y="-6" size="7" rotation="270" rotate="true" text="T13"/>
+        <text x="7" y="12.3333" size="5" text="K1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="-43"/>
+        <circle x="57.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="37.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-40" y="-10" size="7" rotation="270" rotate="true" text="A1"/>
+        <circle x="-42.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <rect width="22" x="19" y="2" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-51" y="19" size="9" text="XPS-BA"/>
+        <terminal x="-40" y="61" orientation="s"/>
+        <terminal x="-40" y="-31" orientation="n"/>
+        <terminal x="40" y="-31" orientation="n"/>
+        <terminal x="60" y="-31" orientation="n"/>
+        <terminal x="20" y="-31" orientation="n"/>
+        <terminal x="0" y="-31" orientation="n"/>
+        <terminal x="-20" y="-31" orientation="n"/>
+        <terminal x="40" y="61" orientation="s"/>
+        <terminal x="70" y="61" orientation="s"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_bc.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_bc.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_bc.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,96 @@
+<definition width="220" version="0.22" hotspot_x="90" hotspot_y="70" height="110" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">XPS-BC</name>
+        <name lang="fr">XPS-BC</name>
+        <name lang="pl">XPS-BC</name>
+        <name lang="cs">XPS-BC</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55" x1="80" y2="-40" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="60" y2="-55" x2="60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="28" x1="3" y2="28" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="103" y2="-58" x2="120"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="41" y2="0" x2="102"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55" x1="100" y2="-10" x2="100"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="25" x1="100" y2="10" x2="100" y3="-11" x3="105"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="100" y2="-10" x2="106"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="120" y2="28" x2="120"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="83" y2="-58" x2="97"/>
+        <circle x="97.764" y="25.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="43" y2="-58" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="28" x1="-17" y2="28" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="28" x1="-37" y2="28" x2="-23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="28" x1="-57" y2="28" x2="-43"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="28" x1="103" y2="28" x2="120"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="-17" y2="-58" x2="-3"/>
+        <input x="0" y="29" size="7" rotation="270" rotate="true" text="T21"/>
+        <input x="-20" y="29" size="7" rotation="270" rotate="true" text="T23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="-80" y2="28" x2="-80"/>
+        <input x="95" y="-41" size="7" rotation="270" rotate="true" text="31"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="28" x1="83" y2="28" x2="97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="-37" y2="-58" x2="-23"/>
+        <circle x="-2.2361" y="25.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-22.2361" y="25.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="28" x1="-80" y2="28" x2="-63"/>
+        <circle x="97.764" y="-60.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="95" y="29" size="7" rotation="270" rotate="true" text="32"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-30" x1="41" y2="-30" x2="77"/>
+        <input x="-40" y="-36" size="7" rotation="270" rotate="true" text="T13"/>
+        <input x="-40" y="29" size="7" rotation="270" rotate="true" text="T22"/>
+        <circle x="77.764" y="25.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="3" y2="-58" x2="17"/>
+        <input x="-60" y="29" size="7" rotation="270" rotate="true" text="A2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="63" y2="-58" x2="77"/>
+        <circle x="-42.2361" y="-60.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-62.2361" y="25.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <text x="7" y="-27.6667" size="5" text="K1"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="25.6667" x1="80" y2="10.6667" x2="80" y3="-9.3333" x3="75"/>
+        <input x="0" y="-37" size="7" rotation="270" rotate="true" text="T11"/>
+        <circle x="-42.2361" y="25.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="43" y2="-58" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="-57" y2="-58" x2="-43"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="25.6667" x1="60" y2="10.6667" x2="60" y3="-9.3333" x3="55"/>
+        <circle x="-2.2361" y="-60.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="28" x1="63" y2="28" x2="77"/>
+        <input x="-21" y="-36" size="7" rotation="270" rotate="true" text="T12"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="23" y2="-58" x2="37"/>
+        <input x="75" y="29" size="7" rotation="270" rotate="true" text="24"/>
+        <circle x="-22.2361" y="-60.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="40" y="-39" size="7" rotation="270" rotate="true" text="Y2"/>
+        <circle x="57.764" y="25.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="20" y="-39" size="7" rotation="270" rotate="true" text="Y1"/>
+        <input x="55" y="-41" size="7" rotation="270" rotate="true" text="13"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-58" x1="-80" y2="-58" x2="-63"/>
+        <circle x="37.7639" y="-60.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="75" y="-41" size="7" rotation="270" rotate="true" text="23"/>
+        <circle x="17.7639" y="-60.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="55" y="29" size="7" rotation="270" rotate="true" text="14"/>
+        <input x="-60" y="-40" size="7" rotation="270" rotate="true" text="A1"/>
+        <circle x="57.764" y="-60.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-62.2361" y="-60.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="77.764" y="-60.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-39.3333" x1="75" y2="-19.3333" x2="80" y3="-9.3333" x3="80"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-39.3333" x1="55" y2="-19.3333" x2="60" y3="-9.3333" x3="60"/>
+        <text x="7" y="2.3333" size="5" text="K2"/>
+        <rect width="22" x="19" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect width="22" x="19" y="-38" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text x="-71" y="-11" size="9" text="XPS-BC"/>
+        <terminal x="-60" y="31" orientation="s"/>
+        <terminal x="-40" y="31" orientation="s"/>
+        <terminal x="-20" y="31" orientation="s"/>
+        <terminal x="0" y="31" orientation="s"/>
+        <terminal x="-60" y="-61" orientation="n"/>
+        <terminal x="20" y="-61" orientation="n"/>
+        <terminal x="40" y="-61" orientation="n"/>
+        <terminal x="0" y="-61" orientation="n"/>
+        <terminal x="-20" y="-61" orientation="n"/>
+        <terminal x="-40" y="-61" orientation="n"/>
+        <terminal x="60" y="-61" orientation="n"/>
+        <terminal x="80" y="-61" orientation="n"/>
+        <terminal x="60" y="31" orientation="s"/>
+        <terminal x="80" y="31" orientation="s"/>
+        <terminal x="100" y="31" orientation="s"/>
+        <terminal x="100" y="-61" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_bf.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_bf.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/preventa_2/xps_bf.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,92 @@
+<definition width="200" version="0.22" hotspot_x="70" hotspot_y="40" height="110" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">XPS-BF</name>
+        <name lang="fr">XPS-BF</name>
+        <name lang="pl">XPS-BF</name>
+        <name lang="cs">XPS-BF</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="80" y2="-25" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="100" y2="-25" x2="100"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="30" x1="62" y2="30" x2="97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="61" y2="0" x2="97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="120" y2="58" x2="120"/>
+        <circle x="-42.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <text x="-51" y="19" size="9" text="XPS-BF"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="103" y2="58" x2="120"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="83" y2="-28" x2="97"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="100" y2="40" x2="100" y3="20" x3="95"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="3" y2="-28" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="103" y2="-28" x2="120"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="63" y2="-28" x2="77"/>
+        <circle x="-22.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-17" y2="-28" x2="-3"/>
+        <circle x="97.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-20" y="-6" size="7" rotation="270" rotate="true" text="S11"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="80" y2="40" x2="80" y3="20" x3="75"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="23" y2="-28" x2="37"/>
+        <input x="75" y="-11" size="7" rotation="270" rotate="true" text="13"/>
+        <circle x="-2.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-22.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="95" y="-11" size="7" rotation="270" rotate="true" text="23"/>
+        <input x="20" y="-5" size="7" rotation="270" rotate="true" text="S13"/>
+        <circle x="77.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <text x="27" y="2.33333" size="5" text="K1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-37" y2="-28" x2="-23"/>
+        <circle x="97.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="17.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="17.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="83" y2="58" x2="97"/>
+        <input x="0" y="-5" size="7" rotation="270" rotate="true" text="S12"/>
+        <text x="27" y="32.3333" size="5" text="K2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="43" y2="-28" x2="57"/>
+        <circle x="37.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-2.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="60" y="-9" size="7" rotation="270" rotate="true" text="Y2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="43" y2="58" x2="57"/>
+        <input x="40" y="-9" size="7" rotation="270" rotate="true" text="Y1"/>
+        <input x="95" y="59" size="7" rotation="270" rotate="true" text="24"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="-43"/>
+        <circle x="57.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="23" y2="58" x2="37"/>
+        <circle x="37.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="77.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-40" y="-10" size="7" rotation="270" rotate="true" text="A1"/>
+        <rect width="22" x="39" y="22" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-42.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="3" y2="58" x2="17"/>
+        <circle x="57.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <rect width="22" x="39" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-17" y2="58" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="63" y2="58" x2="77"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="95" y2="10" x2="100" y3="20" x3="100"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-37" y2="58" x2="-23"/>
+        <input x="75" y="59" size="7" rotation="270" rotate="true" text="14"/>
+        <input x="40" y="59" size="7" rotation="270" rotate="true" text="Y34"/>
+        <input x="60" y="59" size="7" rotation="270" rotate="true" text="Y44"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="75" y2="10" x2="80" y3="20" x3="80"/>
+        <input x="20" y="59" size="7" rotation="270" rotate="true" text="S23"/>
+        <input x="0" y="59" size="7" rotation="270" rotate="true" text="S22"/>
+        <input x="-20" y="59" size="7" rotation="270" rotate="true" text="S21"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="58" x2="-60"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-60" y2="58" x2="-43"/>
+        <input x="-40" y="59" size="7" rotation="270" rotate="true" text="A2"/>
+        <terminal x="-40" y="-31" orientation="n"/>
+        <terminal x="40" y="-31" orientation="n"/>
+        <terminal x="60" y="-31" orientation="n"/>
+        <terminal x="20" y="-31" orientation="n"/>
+        <terminal x="0" y="-31" orientation="n"/>
+        <terminal x="-20" y="-31" orientation="n"/>
+        <terminal x="-40" y="61" orientation="s"/>
+        <terminal x="-20" y="61" orientation="s"/>
+        <terminal x="0" y="61" orientation="s"/>
+        <terminal x="20" y="61" orientation="s"/>
+        <terminal x="40" y="61" orientation="s"/>
+        <terminal x="80" y="61" orientation="s"/>
+        <terminal x="60" y="61" orientation="s"/>
+        <terminal x="100" y="61" orientation="s"/>
+        <terminal x="80" y="-31" orientation="n"/>
+        <terminal x="100" y="-31" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/preventa/qet_directory
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/qet_directory	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/qet_directory	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,7 @@
+<qet-directory>
+    <names>
+	<name lang="en" >Preventa_1</name>
+        <name lang="fr" >Preventa_1</name>
+        <name lang="pl" >Preventa_1</name>
+    </names>
+</qet-directory>

Copied: branches/0.3/elements/blocs_de_securite/preventa/xps-al.elmt (from rev 1060, branches/0.3/elements/blocs_de_securite/xps-al.elmt)
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/xps-al.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/xps-al.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,113 @@
+<definition width="320" version="0.2" hotspot_x="70" hotspot_y="40" height="140" type="element" orientation="dyyy" >
+    <names>
+        <name lang="en" >XPS-AL</name>
+        <name lang="fr" >XPS-AL</name>
+        <name lang="pl" >XPS-AL</name>
+        <name lang="cs" >XPS-AL</name>
+    </names>
+    <description>
+        <rect width="15" x="73.5" y="55.5" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <rect width="15" x="29" y="56" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="230" x2="230" x3="227" x4="226" antialias="false" x5="226" x6="230" x7="230" x8="230" x9="230" closed="false" y1="-10" y2="24" y3="27" y4="28" y5="31" y6="35" y7="69" y8="70" y9="69" />
+        <rect width="300" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="229" y2="35" x2="228" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="230" y2="33" x2="230" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="226" y2="23" x2="226" />
+        <text x="42" y="38.3333" size="4" text="K1/K2" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="44" x1="70" y2="44" x2="68" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="44" x1="70" y2="41" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="40" x1="67" y2="44" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="39" x1="60" y2="39" x2="66" />
+        <polygon x4="60" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="35" x1="60" y2="35" x2="66" y3="39" x3="63" y4="35" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="32" x1="63" y2="42" x2="63" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="43.95" x1="73.45" y2="43.95" x2="71.45" />
+        <rect width="76" x="20" y="9" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="43.95" x1="73.45" y2="40.95" x2="73.45" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="39.95" x1="70.45" y2="43.95" x2="73.45" />
+        <text x="45" y="22" size="6" text="LOGIC" />
+        <text x="79" y="61.3333" size="4" text="K2" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="36" y2="49" x2="36" />
+        <text x="34" y="61.3333" size="4" text="K1" />
+        <text x="13" y="-17.3333" size="8" text="Y1" />
+        <text x="82" y="-17.3333" size="8" text="Y2" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="80" y2="-11" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="100" y2="-11" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="30" y2="-11" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="10" y2="-11" x2="10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-29" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="140" y2="-29" x2="140" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="160" y2="-29" x2="160" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="180" y2="-29" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="200" y2="-30" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="89" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="10" y2="45" x2="10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="90" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="180" y2="89" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="160" y2="89" x2="160" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="140" y2="89" x2="140" />
+        <text x="3" y="82.6667" size="8" text="PE" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="20" y2="90" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="0" y2="90" x2="0" />
+        <text x="-57" y="82.6667" size="8" text="A2" />
+        <text x="-57" y="-18.3333" size="8" text="A1" />
+        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="29" x1="-45" y2="29" x2="-50" y3="-10" x3="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-16" y2="30" x2="-22" />
+        <polygon x4="-26" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="37" x1="-41" y2="37" x2="-38" y3="20" x3="-26" y4="21" />
+        <rect width="22" x="-44" y="26" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <polygon x4="-50" y5="70" x5="-50" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="30" x1="4" y2="50" x2="4" y3="50" x3="-50" y4="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="89" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-40" y2="-29" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-6" y2="41" x2="-6" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="13" y2="44" x2="13" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="13" y2="14" x2="13" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34" x1="19" y2="34" x2="18" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34" x1="19" y2="33" x2="19" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="33" x1="18" y2="34" x2="19" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="34" x1="11" y2="34" x2="15" />
+        <polygon x4="13" y5="31" x5="11" y6="31" x6="11" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="31" x1="11" y2="31" x2="15" y3="31" x3="15" y4="34" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28" x1="13" y2="37" x2="13" />
+        <rect width="4" x="11" y="18" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="36" x1="18" y2="36" x2="17" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="36" x1="18" y2="35" x2="18" />
+        <polygon x4="-6" y5="28" x5="-8" y6="28" x6="-4" y7="28" x7="-5" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="28" x1="-6" y2="31" x2="-8" y3="31" x3="-4" y4="28" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="35" x1="17" y2="36" x2="18" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="24" x1="-6" y2="33" x2="-6" />
+        <polygon x4="20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="41" x1="-6" y2="45" x2="-6" y3="45" x3="20" y4="45" />
+        <polygon x4="20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="-6" y2="13" x2="-6" y3="13" x3="20" y4="13" />
+        <polygon x4="68" y5="49" x5="68" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="63" x1="81" y2="66" x2="81" y3="66" x3="68" y4="49" />
+        <polygon x4="50" y5="49" x5="50" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="63" x1="36" y2="66" x2="36" y3="66" x3="50" y4="49" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="80" y2="49" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="10" x1="140" y2="10" x2="187" />
+        <text x="132" y="10.3333" size="4" text="K1" />
+        <polygon x4="4" y5="20" x5="-6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="-6" y2="30" x2="-16" y3="40" x3="-6" y4="30" />
+        <text x="131" y="53.3333" size="4" text="K2" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="52.95" x1="140.45" y2="52.95" x2="187.45" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.5" x1="-59.0625" y2="-10.5" x2="238.938" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="185" y2="60" x2="190" y3="70" x3="190" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="165" y2="60" x2="170" y3="70" x3="170" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="145" y2="60" x2="150" y3="70" x3="150" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="145.375" y2="20" x2="150" y3="30" x3="150" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="239" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="185.375" y2="20" x2="190" y3="30" x3="190" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="165.375" y2="20" x2="170" y3="30" x3="170" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="190" y2="40" x2="190" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="170" y2="40" x2="170" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="150" y2="40" x2="150" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="150.375" y2="0" x2="150.375" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="190.375" y2="0" x2="190.375" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="170.375" y2="0" x2="170.375" />
+        <terminal x="-50" y="-34" orientation="n" />
+        <terminal x="-50" y="94" orientation="s" />
+        <terminal x="10" y="94" orientation="s" />
+        <terminal x="150" y="94" orientation="s" />
+        <terminal x="170" y="94" orientation="s" />
+        <terminal x="190" y="94" orientation="s" />
+        <terminal x="150" y="-34" orientation="n" />
+        <terminal x="170" y="-34" orientation="n" />
+        <terminal x="190" y="-34" orientation="n" />
+        <terminal x="230" y="-34" orientation="n" />
+        <terminal x="230" y="94" orientation="s" />
+        <terminal x="20" y="-34" orientation="n" />
+        <terminal x="90" y="-34" orientation="n" />
+    </description>
+</definition>

Copied: branches/0.3/elements/blocs_de_securite/preventa/xps_ac.elmt (from rev 1060, branches/0.3/elements/blocs_de_securite/xps_ac.elmt)
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/xps_ac.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/xps_ac.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,134 @@
+<definition width="360" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="en" >XPS-AC</name>
+        <name lang="fr" >XPS-AC</name>
+        <name lang="pl" >XPS-AC</name>
+        <name lang="cs" >XPS-AC</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36" x1="10" y2="36" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="10" y2="36" x2="10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="5" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="5" x2="10" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="29" x1="262" y2="21" x2="270" y3="-10" x3="270" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="270" y2="39" x2="270" />
+        <polygon x4="269" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="36" x1="269" y2="39" x2="270" y3="38" x3="267" y4="36" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="39" x1="270" y2="31" x2="262" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="262" y2="30" x2="253" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="262" y2="34" x2="262" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="30" y2="90" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="50" y2="90" x2="50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-43" y2="60" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-8" y2="20" x2="0" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-50" y2="60" x2="-50" />
+        <text x="-46" y="67" size="6" text="48V, 115V, 230V" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-43" y2="20" x2="-43" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="14" y2="10" x2="18" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="20" y2="20" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="30" y2="60" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-43" y2="20" x2="-33" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="14" y2="30" x2="18" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="16" y2="12" x2="16" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="40" y2="36" x2="40" />
+        <rect width="60" x="60" y="0" antialias="false" height="41" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="14" x1="147" y2="14" x2="226" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="100" y2="65" x2="115" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="160" y2="-10" x2="160" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="140" y2="-10" x2="140" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="100" y2="41" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="70" y2="41" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="85" y2="65" x2="85" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-50" y2="-10" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="70" y2="65" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="115" y2="65" x2="115" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="70" y2="65" x2="85" />
+        <polygon x4="20" y5="30" x5="10" y6="20" x6="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="20" x2="0" y3="10" x3="10" y4="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="160" y2="70" x2="160" />
+        <arc width="5" x="-52.25" y="55" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="140" y2="70" x2="140" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="100" y2="65" x2="100" />
+        <polygon x4="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="24" x1="6" y2="24" x2="14" y3="16" x3="10" y4="24" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="27" x1="10" y2="13" x2="10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="16" x1="6" y2="16" x2="13" />
+        <arc width="5" x="-45.25" y="50" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <arc width="5" x="-45.25" y="40" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <arc width="5" x="-45.25" y="45" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <arc width="5" x="-52.25" y="40" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <arc width="5" x="-52.25" y="50" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <arc width="5" x="-52.25" y="45" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <text x="225" y="-16.6667" size="7" text="24" />
+        <text x="138" y="44.3333" size="4" text="K2" />
+        <text x="139" y="16.3333" size="4" text="K1" />
+        <text x="224" y="83.3333" size="7" text="34" />
+        <arc width="5" x="-45.25" y="55" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="43" x1="147" y2="43" x2="226" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="230" y2="-10" x2="230" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="150" y2="-10" x2="150" />
+        <text x="34" y="82.3333" size="7" text="PE" />
+        <text x="-23" y="33.3333" size="7" text="T" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="28" x1="-33" y2="28" x2="-28" y3="12" x3="-8" />
+        <rect width="20" x="60" y="50" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <rect width="20" x="90" y="50" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="185" y="82.3333" size="7" text="24" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="70" y2="0" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="110" y2="0" x2="110" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="240" y2="89" x2="240" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="260" y2="89" x2="260" />
+        <rect width="340" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="104" y="-16.6667" size="7" text="Y2" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="100" y2="-11" x2="100" />
+        <text x="145" y="83.3333" size="7" text="14" />
+        <text x="185" y="-16.6667" size="7" text="23" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="230" y2="26" x2="230" y3="6" x3="225" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="230" y2="55" x2="230" y3="35" x3="225" />
+        <text x="262" y="82.3333" size="7" text="Y44" />
+        <text x="262" y="-16.6667" size="7" text="Y43" />
+        <text x="145" y="-16.6667" size="7" text="13" />
+        <text x="-38" y="6.66667" size="9" text="XPS AC" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="260" y2="-11" x2="260" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="120" y2="-11" x2="120" />
+        <rect width="25" x="-33" y="15" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="190" y2="-10" x2="190" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="280" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="280" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="150" y2="26" x2="150" y3="6" x3="145" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="190" y2="26" x2="190" y3="6" x3="185" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="150" y2="55" x2="150" y3="35" x3="145" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="190" y2="55" x2="190" y3="35" x3="185" />
+        <text x="102" y="82.3333" size="7" text="S22" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="120" y2="89" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="100" y2="89" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-40" y2="-11" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
+        <text x="64" y="23" size="6" text="Logic" />
+        <text x="64" y="-16.6667" size="7" text="Y1" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="60" y2="-11" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="80" y2="-10" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="240" y2="-29" x2="240" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="180" y2="-29" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="200" y2="-29" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-30" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="89" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="90" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="180" y2="89" x2="180" />
+        <text x="-56" y="82.3333" size="7" text="A2" />
+        <text x="-56" y="-16.6667" size="7" text="A1" />
+        <text x="62" y="65.3333" size="4" text="K1" />
+        <text x="92" y="65.3333" size="4" text="K2" />
+        <terminal x="150" y="-30" orientation="n" />
+        <terminal x="150" y="90" orientation="s" />
+        <terminal x="-50" y="-30" orientation="n" />
+        <terminal x="-50" y="90" orientation="s" />
+        <terminal x="110" y="90" orientation="s" />
+        <terminal x="190" y="90" orientation="s" />
+        <terminal x="190" y="-30" orientation="n" />
+        <terminal x="230" y="-30" orientation="n" />
+        <terminal x="270" y="-30" orientation="n" />
+        <terminal x="230" y="90" orientation="s" />
+        <terminal x="110" y="-30" orientation="n" />
+        <terminal x="70" y="-30" orientation="n" />
+        <terminal x="270" y="90" orientation="s" />
+        <terminal x="40" y="90" orientation="s" />
+    </description>
+</definition>

Copied: branches/0.3/elements/blocs_de_securite/preventa/xps_af.elmt (from rev 1060, branches/0.3/elements/blocs_de_securite/xps_af.elmt)
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/xps_af.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/xps_af.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,119 @@
+<definition width="360" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="en" >XPS-AF</name>
+        <name lang="fr" >XPS-AF</name>
+        <name lang="pl" >XPS-AF</name>
+        <name lang="cs" >XPS-AF</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="16" y2="5" x2="10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-50" y2="5" x2="-15" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-50" y2="5" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="270" y2="-10" x2="270" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="110" y2="60" x2="110" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="130" y2="35" x2="116" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="190" y2="-10" x2="190" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="16" y2="5" x2="16" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-10" y2="40" x2="16" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-10" y2="40" x2="-10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="10" y2="65" x2="10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="24" y2="55" x2="10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-50" y2="65" x2="-50" />
+        <text x="-5" y="18.3333" size="7" text="T" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="13" x1="-15" y2="13" x2="-10" y3="-3" x3="10" />
+        <rect width="20" x="120" y="10" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <rect width="20" x="120" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="130" y2="21" x2="130" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="130" y2="35" x2="130" />
+        <text x="225" y="82.3333" size="7" text="24" />
+        <rect width="92" x="24" y="0" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="70" y2="0" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="110" y2="0" x2="110" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="240" y2="89" x2="240" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="260" y2="89" x2="260" />
+        <rect width="340" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="102" y="-16.6667" size="7" text="S39" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="100" y2="-11" x2="100" />
+        <text x="184" y="82.3333" size="7" text="14" />
+        <text x="225" y="-16.6667" size="7" text="23" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="270" y2="25" x2="270" y3="5" x3="265" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="270" y2="55" x2="270" y3="35" x3="265" />
+        <text x="265" y="82.3333" size="7" text="34" />
+        <text x="265" y="-16.6667" size="7" text="33" />
+        <text x="184" y="-16.6667" size="7" text="13" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="130" y2="5" x2="130" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="130" y2="26" x2="116" />
+        <text x="-56" y="36.6667" size="9" text="XPS AF" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="260" y2="-11" x2="260" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="120" y2="-11" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-11" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="130" y2="5" x2="116" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="30" y2="0" x2="30" />
+        <polygon x4="-30" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="5" x1="-30" y2="0" x2="-40" y3="10" x3="-40" y4="5" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="30" y2="61" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="70" y2="65" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="10" x2="-30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="70" y2="65" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="130" y2="56" x2="116" />
+        <rect width="25" x="-15" y="0" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="130" y2="51" x2="130" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="230" y2="-10" x2="230" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="15" x1="140" y2="15" x2="267" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="280" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="280" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="40" y2="-11" x2="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="45" x1="140" y2="45" x2="267" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="190" y2="25" x2="190" y3="5" x3="185" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="230" y2="25" x2="230" y3="5" x3="225" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="190" y2="55" x2="190" y3="35" x3="185" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="231" y2="55" x2="231" y3="35" x3="226" />
+        <text x="102" y="82.3333" size="7" text="S22" />
+        <text x="62" y="82.3333" size="7" text="S21" />
+        <text x="22" y="82.3333" size="7" text="S12" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-11" x2="0" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-20" y2="-11" x2="-20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="120" y2="89" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="100" y2="89" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="80" y2="89" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="60" y2="89" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="40" y2="89" x2="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="0" y2="89" x2="0" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-40" y2="-11" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
+        <text x="29" y="32" size="6" text="Logic" />
+        <text x="22" y="-16.6667" size="7" text="S33" />
+        <text x="62" y="-16.6667" size="7" text="S34" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="60" y2="-11" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="80" y2="-10" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="240" y2="-29" x2="240" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="180" y2="-29" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="200" y2="-29" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-30" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="89" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="90" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="180" y2="89" x2="180" />
+        <text x="-17" y="82.3333" size="7" text="S11" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="20" y2="90" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-20" y2="90" x2="-20" />
+        <text x="-55" y="82.3333" size="7" text="A2" />
+        <text x="-56" y="-16.6667" size="7" text="A1" />
+        <text x="133" y="7.33333" size="4" text="K1" />
+        <text x="132" y="37.3333" size="4" text="K2" />
+        <terminal x="30" y="-30" orientation="n" />
+        <terminal x="-50" y="-30" orientation="n" />
+        <terminal x="-50" y="90" orientation="s" />
+        <terminal x="30" y="90" orientation="s" />
+        <terminal x="110" y="90" orientation="s" />
+        <terminal x="190" y="90" orientation="s" />
+        <terminal x="190" y="-30" orientation="n" />
+        <terminal x="230" y="-30" orientation="n" />
+        <terminal x="270" y="-30" orientation="n" />
+        <terminal x="230" y="90" orientation="s" />
+        <terminal x="110" y="-30" orientation="n" />
+        <terminal x="70" y="-30" orientation="n" />
+        <terminal x="-10" y="90" orientation="s" />
+        <terminal x="70" y="90" orientation="s" />
+        <terminal x="270" y="90" orientation="s" />
+    </description>
+</definition>

Copied: branches/0.3/elements/blocs_de_securite/preventa/xps_afl.elmt (from rev 1060, branches/0.3/elements/blocs_de_securite/xps_afl.elmt)
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/xps_afl.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/xps_afl.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,123 @@
+<definition width="360" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="en" >XPS-AFL</name>
+        <name lang="fr" >XPS-AFL</name>
+        <name lang="pl" >XPS-AFL</name>
+        <name lang="cs" >XPS-AFL</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="5" x2="15" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-50" y2="5" x2="-15" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-50" y2="5" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="15" y2="5" x2="15" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-10" y2="70" x2="-10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-10" y2="40" x2="15" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="130" y2="35" x2="116" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="70" y2="67" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="110" y2="60" x2="110" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="270" y2="-10" x2="270" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="-50" y2="70" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="190" y2="-10" x2="190" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="63" x1="50" y2="63" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="50" y2="63" x2="50" />
+        <text x="42" y="82.3333" size="7" text="S12" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="24" y2="55" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="67" x1="-10" y2="67" x2="70" />
+        <text x="-5" y="18.3333" size="7" text="T" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="13" x1="-15" y2="13" x2="-10" y3="-3" x3="10" />
+        <rect width="20" x="120" y="10" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <rect width="20" x="120" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="130" y2="21" x2="130" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="130" y2="35" x2="130" />
+        <text x="225" y="82.3333" size="7" text="24" />
+        <rect width="92" x="24" y="0" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="70" y2="0" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="110" y2="0" x2="110" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="240" y2="89" x2="240" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="260" y2="89" x2="260" />
+        <rect width="340" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="102" y="-16.6667" size="7" text="S39" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="100" y2="-11" x2="100" />
+        <text x="184" y="82.3333" size="7" text="14" />
+        <text x="225" y="-16.6667" size="7" text="23" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="270" y2="25" x2="270" y3="5" x3="265" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="270" y2="55" x2="270" y3="35" x3="265" />
+        <text x="263" y="82.3333" size="7" text="34" />
+        <text x="265" y="-16.6667" size="7" text="33" />
+        <text x="184" y="-16.6667" size="7" text="13" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="130" y2="5" x2="130" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="130" y2="26" x2="116" />
+        <text x="-57" y="33.6667" size="9" text="XPS AFL" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="260" y2="-11" x2="260" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="120" y2="-11" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-11" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="130" y2="5" x2="116" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="30" y2="0" x2="30" />
+        <polygon x4="-30" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="5" x1="-30" y2="0" x2="-40" y3="10" x3="-40" y4="5" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="213" y2="90" x2="206" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="30" y2="61" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="10" x2="-30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="130" y2="56" x2="116" />
+        <rect width="25" x="-15" y="0" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="130" y2="51" x2="130" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="230" y2="-10" x2="230" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="15" x1="140" y2="15" x2="267" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="280" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="280" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="40" y2="-11" x2="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="45" x1="140" y2="45" x2="267" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="190" y2="25" x2="190" y3="5" x3="185" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="230" y2="25" x2="230" y3="5" x3="225" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="190" y2="55" x2="190" y3="35" x3="185" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="231" y2="55" x2="231" y3="35" x3="226" />
+        <text x="102" y="82.3333" size="7" text="S22" />
+        <text x="62" y="82.3333" size="7" text="S11" />
+        <text x="22" y="82.3333" size="7" text="S12" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-11" x2="0" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-20" y2="-11" x2="-20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="120" y2="89" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="100" y2="89" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="80" y2="89" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="60" y2="89" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="40" y2="89" x2="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="0" y2="89" x2="0" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-40" y2="-11" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
+        <text x="29" y="32" size="6" text="Logic" />
+        <text x="22" y="-16.6667" size="7" text="S33" />
+        <text x="62" y="-16.6667" size="7" text="S34" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="60" y2="-11" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="80" y2="-10" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="240" y2="-29" x2="240" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="180" y2="-29" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="200" y2="-29" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-30" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="89" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="90" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="180" y2="89" x2="180" />
+        <text x="-17" y="82.3333" size="7" text="S11" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="20" y2="90" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-20" y2="90" x2="-20" />
+        <text x="-56" y="82.3333" size="7" text="A2" />
+        <text x="-56" y="-16.6667" size="7" text="A1" />
+        <text x="133" y="7.33333" size="4" text="K1" />
+        <text x="132" y="37.3333" size="4" text="K2" />
+        <terminal x="30" y="-30" orientation="n" />
+        <terminal x="-50" y="-30" orientation="n" />
+        <terminal x="-50" y="90" orientation="s" />
+        <terminal x="30" y="90" orientation="s" />
+        <terminal x="110" y="90" orientation="s" />
+        <terminal x="190" y="90" orientation="s" />
+        <terminal x="190" y="-30" orientation="n" />
+        <terminal x="230" y="-30" orientation="n" />
+        <terminal x="270" y="-30" orientation="n" />
+        <terminal x="230" y="90" orientation="s" />
+        <terminal x="110" y="-30" orientation="n" />
+        <terminal x="70" y="-30" orientation="n" />
+        <terminal x="-10" y="90" orientation="s" />
+        <terminal x="70" y="90" orientation="s" />
+        <terminal x="270" y="90" orientation="s" />
+        <terminal x="50" y="90" orientation="s" />
+    </description>
+</definition>

Copied: branches/0.3/elements/blocs_de_securite/preventa/xps_asf.elmt (from rev 1060, branches/0.3/elements/blocs_de_securite/xps_asf.elmt)
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/xps_asf.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/xps_asf.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,198 @@
+<definition width="630" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="en" >XPS-ASF</name>
+        <name lang="fr" >XPS-ASF</name>
+        <name lang="pl" >XPS-ASF</name>
+        <name lang="cs" >XPS-ASF</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="380" y2="-10" x2="380" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="64" x1="280" y2="41" x2="280" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="12" y2="40" x2="27" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36" x1="24" y2="44" x2="24" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="270" y2="0" x2="270" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="230" y2="0" x2="230" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="270" y2="41" x2="270" />
+        <text x="302" y="83.3333" size="7" text="S34" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="300" y2="90" x2="300" />
+        <text x="425" y="83.3333" size="7" text="24" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="420" y2="90" x2="420" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="440" y2="90" x2="440" />
+        <text x="434" y="63.3333" size="5" text="Sicherung" />
+        <text x="434" y="56.3333" size="5" text="Power OK" />
+        <text x="434" y="49.3333" size="5" text="Fusible" />
+        <text x="440" y="37.3333" size="5" text="A1/A2" />
+        <text x="470" y="37.3333" size="5" text="K1/K2" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31" x1="492" y2="31" x2="482" />
+        <polygon x4="470" antialias="false" style="line-style:normal;line-weight:thin;filling:black;color:black" y1="21" x1="470" y2="23" x2="465" y3="26" x3="468" y4="21" />
+        <text x="455" y="83.3333" size="7" text="T33/43" />
+        <text x="512" y="83.3333" size="7" text="Y44" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="530" y2="90" x2="530" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="510" y2="90" x2="510" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="520" y2="70" x2="520" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="500" y2="5" x2="520" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="500" y2="56" x2="470" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="470" y2="70" x2="470" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="500" y2="56" x2="500" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="450" y2="70" x2="450" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="490" y2="70" x2="490" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="480" y2="-30" x2="480" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="460" y2="-30" x2="460" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="440" y2="-30" x2="440" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="420" y2="-30" x2="420" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="400" y2="-30" x2="400" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="360" y2="-30" x2="360" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="340" y2="-30" x2="340" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="320" y2="-30" x2="320" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="300" y2="-30" x2="300" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="90" y2="90" x2="90" />
+        <text x="-5" y="83.3333" size="7" text="PE" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-10" y2="90" x2="-10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="10" y2="90" x2="10" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="350" y2="26" x2="350" y3="3" x3="356" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="190" y2="70" x2="190" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36" x1="350" y2="36" x2="357" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="80" y2="-30" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="60" y2="-30" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="110" y2="70" x2="110" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="40" y2="-30" x2="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="230" y2="50" x2="230" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="230" y2="65" x2="270" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="50" y2="-10" x2="50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="280" y2="-30" x2="280" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="0" y2="40" x2="0" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="100" y2="-30" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="350" y2="5" x2="357" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="64" x1="350" y2="64" x2="280" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="70" y2="5" x2="50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="230" y2="65" x2="230" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="30" y2="40" x2="49" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="20" y2="20" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="200" y2="65" x2="215" />
+        <polygon x4="24" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="24" y2="36" x2="16" y3="44" x3="16" y4="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="100" y2="41" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="200" y2="41" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="180" y2="41" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="140" y2="41" x2="140" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="190" y2="0" x2="190" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="200" y2="65" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="215" y2="41" x2="215" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="60" y2="65" x2="0" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="60" y2="65" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36" x1="70" y2="36" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="60" y2="-5" x2="140" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-8" y2="20" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="380" y2="90" x2="380" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="400" y2="90" x2="400" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="320" y2="90" x2="320" />
+        <text x="385" y="83.3333" size="7" text="14" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="40" x2="10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-43" y2="60" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="140" y2="-10" x2="140" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="20" y2="60" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31" x1="462" y2="31" x2="452" />
+        <polygon x4="500" antialias="false" style="line-style:normal;line-weight:thin;filling:black;color:black" y1="21" x1="500" y2="23" x2="495" y3="26" x3="498" y4="21" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="27" x1="492" y2="35" x2="492" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="29" x1="492" y2="21" x2="500" y3="5" x3="500" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="27" x1="462" y2="35" x2="462" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="470" y2="33" x2="462" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="29" x1="462" y2="21" x2="470" y3="-10" x3="470" />
+        <text x="462" y="-17.6667" size="7" text="Y34" />
+        <text x="425" y="-17.6667" size="7" text="23" />
+        <text x="385" y="-17.6667" size="7" text="13" />
+        <text x="305" y="-17.6667" size="7" text="Y1" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="350" y2="-10" x2="350" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="64" x1="350" y2="57" x2="350" y3="34" x3="356" />
+        <text x="344" y="-17.6667" size="7" text="Y2" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="500" y2="33" x2="492" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="30" y2="90" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="70" y2="90" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-50" y2="60" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-43" y2="20" x2="-43" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="27" y2="30" x2="31" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-43" y2="20" x2="-33" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="10" y2="30" x2="14" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28" x1="29" y2="32" x2="29" />
+        <rect width="220" x="70" y="0" antialias="false" height="41" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="14" x1="353" y2="14" x2="427" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="160" y2="-10" x2="160" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="120" y2="-10" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-50" y2="-10" x2="-50" />
+        <polygon x4="30" y5="50" x5="20" y6="40" x6="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="10" y2="40" x2="10" y3="30" x3="20" y4="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="150" y2="70" x2="150" />
+        <arc width="5" x="-52.25" y="55" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="130" y2="70" x2="130" />
+        <arc width="5" x="-45.25" y="50" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <arc width="5" x="-45.25" y="40" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <arc width="5" x="-45.25" y="45" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <arc width="5" x="-52.25" y="40" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <arc width="5" x="-52.25" y="50" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <arc width="5" x="-52.25" y="45" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <text x="222" y="-16.6667" size="7" text="S32" />
+        <text x="340" y="45.3333" size="4" text="K2" />
+        <text x="340" y="15.3333" size="4" text="K1" />
+        <arc width="5" x="-45.25" y="55" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="44" x1="353" y2="44" x2="427" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="430" y2="-10" x2="430" />
+        <text x="36" y="83.3333" size="7" text="S33/41" />
+        <text x="-23" y="33.3333" size="7" text="T" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="28" x1="-33" y2="28" x2="-28" y3="12" x3="-8" />
+        <rect width="20" x="190" y="50" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <rect width="20" x="220" y="50" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="174" y="83.3333" size="7" text="Y4" />
+        <rect width="610" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="82" y="-17.6667" size="7" text="S12" />
+        <text x="134" y="83.3333" size="7" text="Y3" />
+        <text x="182" y="-17.6667" size="7" text="S22" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="430" y2="26" x2="430" y3="6" x3="425" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="430" y2="55" x2="430" y3="35" x3="425" />
+        <text x="265" y="-17.6667" size="7" text="B1" />
+        <text x="126" y="-17.6667" size="7" text="S21/31" />
+        <text x="-38" y="7.66667" size="9" text="XPS ASF" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="260" y2="-11" x2="260" />
+        <rect width="25" x="-33" y="15" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="390" y2="-10" x2="390" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="550" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="550" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="390" y2="26" x2="390" y3="6" x3="385" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="390" y2="55" x2="390" y3="35" x3="385" />
+        <text x="92" y="83.3333" size="7" text="S42" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-40" y2="-11" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
+        <text x="74" y="22" size="6" text="Logic" />
+        <text x="43" y="-17.6667" size="7" text="S11" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="240" y2="-29" x2="240" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="180" y2="-29" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="200" y2="-29" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-30" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="170" y2="91" x2="170" />
+        <text x="-56" y="83.3333" size="7" text="A2" />
+        <text x="-56" y="-17.6667" size="7" text="A1" />
+        <text x="192" y="65.3333" size="4" text="K1" />
+        <text x="222" y="65.3333" size="4" text="K2" />
+        <terminal x="310" y="90" orientation="s" />
+        <terminal x="390" y="90" orientation="s" />
+        <terminal x="140" y="-30" orientation="n" />
+        <terminal x="140" y="90" orientation="s" />
+        <terminal x="-50" y="-30" orientation="n" />
+        <terminal x="-50" y="90" orientation="s" />
+        <terminal x="100" y="90" orientation="s" />
+        <terminal x="180" y="90" orientation="s" />
+        <terminal x="190" y="-30" orientation="n" />
+        <terminal x="230" y="-30" orientation="n" />
+        <terminal x="270" y="-30" orientation="n" />
+        <terminal x="90" y="-30" orientation="n" />
+        <terminal x="50" y="-30" orientation="n" />
+        <terminal x="50" y="90" orientation="s" />
+        <terminal x="0" y="90" orientation="s" />
+        <terminal x="470" y="-30" orientation="n" />
+        <terminal x="430" y="-30" orientation="n" />
+        <terminal x="390" y="-30" orientation="n" />
+        <terminal x="350" y="-30" orientation="n" />
+        <terminal x="310" y="-30" orientation="n" />
+        <terminal x="470" y="90" orientation="s" />
+        <terminal x="520" y="90" orientation="s" />
+        <terminal x="430" y="90" orientation="s" />
+    </description>
+</definition>

Copied: branches/0.3/elements/blocs_de_securite/preventa/xps_ba.elmt (from rev 1060, branches/0.3/elements/blocs_de_securite/xps_ba.elmt)
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/xps_ba.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/xps_ba.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,86 @@
+<definition width="290" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="en" >XPS-BA</name>
+        <name lang="fr" >XPS-BA</name>
+        <name lang="pl" >XPS-BA</name>
+        <name lang="cs" >XPS-BA</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="30" x1="150" y2="30" x2="188" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="140" y2="20" x2="140" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="140" y2="40" x2="140" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="120" y2="-30" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="30" y2="30" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="-10" x2="-10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="0" x2="-10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="180" y2="-30" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="140" y2="20" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="140" y2="40" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="200" y2="-30" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="15" y2="30" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-50" y2="50" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="-26" y2="34" x2="-26" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-37" y2="30" x2="-23" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="20" x2="-30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-50" y2="60" x2="-30" />
+        <polygon x4="-26" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="30" x1="-26" y2="26" x2="-34" y3="34" x3="-34" y4="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-50" y2="0" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="80" y2="-30" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-20" y2="-30" x2="-20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-10" x2="0" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="40" y2="-10" x2="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="40" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-50" y2="60" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="180" y2="40" x2="188" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="180" y2="70" x2="180" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="190" y2="21" x2="190" y3="42" x3="186" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-50" y2="50" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-10" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="60" y2="-30" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-50" y2="0" x2="-30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-30" y2="40" x2="-30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-40" y2="30" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="100" y2="-30" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-20" y2="30" x2="-10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-40" y2="-30" x2="-40" />
+        <text x="23" y="-16.6667" size="7" text="T11" />
+        <text x="-17" y="-16.6667" size="7" text="T11" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-24" y2="20" x2="-20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-40" y2="20" x2="-36" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="-22" y2="22" x2="-22" />
+        <rect width="60" x="60" y="0" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <polygon x4="-20" y5="40" x5="-30" y6="30" x6="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="30" x1="-40" y2="30" x2="-40" y3="20" x3="-30" y4="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="170" y2="70" x2="170" />
+        <text x="145" y="22.3333" size="4" text="K1" />
+        <text x="195" y="82.3333" size="7" text="14" />
+        <text x="0" y="43.3333" size="7" text="T" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="38" x1="-10" y2="38" x2="-5" y3="22" x3="15" />
+        <rect width="20" x="130" y="25" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="174" y="82.3333" size="7" text="12" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="70" y2="0" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="110" y2="0" x2="110" />
+        <rect width="270" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="103" y="-16.6667" size="7" text="T13" />
+        <text x="185" y="-16.6667" size="7" text="23" />
+        <text x="-12" y="62.6667" size="9" text="XPS BA" />
+        <rect width="25" x="-10" y="25" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-60" y2="70" x2="210" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="210" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
+        <text x="64" y="32" size="6" text="Logic" />
+        <text x="63" y="-16.6667" size="7" text="T12" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="190" y2="90" x2="190" />
+        <text x="-56" y="82.3333" size="7" text="A2" />
+        <text x="-56" y="-16.6667" size="7" text="A1" />
+        <terminal x="-10" y="-30" orientation="n" />
+        <terminal x="30" y="-30" orientation="n" />
+        <terminal x="-50" y="-30" orientation="n" />
+        <terminal x="-50" y="90" orientation="s" />
+        <terminal x="180" y="90" orientation="s" />
+        <terminal x="190" y="-30" orientation="n" />
+        <terminal x="200" y="90" orientation="s" />
+        <terminal x="110" y="-30" orientation="n" />
+        <terminal x="70" y="-30" orientation="n" />
+    </description>
+</definition>

Copied: branches/0.3/elements/blocs_de_securite/preventa/xps_bc.elmt (from rev 1060, branches/0.3/elements/blocs_de_securite/xps_bc.elmt)
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/xps_bc.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/xps_bc.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,149 @@
+<definition width="410" version="0.22" hotspot_x="90" hotspot_y="70" height="170" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="en" >XPS-BC</name>
+        <name lang="fr" >XPS-BC</name>
+        <name lang="pl" >XPS-BC</name>
+        <name lang="cs" >XPS-BC</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="210" y2="90" x2="210" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-56" y2="50" x2="50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-40" y2="32" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-63" y2="37" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="-40" y2="12" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="-63" y2="7" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="-56" y2="50" x2="-56" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="200" y2="-40" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="290" y2="-40" x2="290" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="120" y2="-40" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="60" y2="-40" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="270" y2="-40" x2="270" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="46" x1="70" y2="70" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="240" y2="-40" x2="240" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="40" y2="-40" x2="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="250" y2="-40" x2="250" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="280" y2="40" x2="280" y3="18" x3="286" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="100" y2="-40" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="80" y2="-40" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="230" y2="-40" x2="230" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="200" y2="40" x2="200" y3="19" x3="195" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="-50" y2="22" x2="-56" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="280" y2="20" x2="280" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="290" y2="90" x2="290" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="52" x1="93" y2="46" x2="93" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="120" y2="90" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="20" y2="-40" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="46" x1="110" y2="66" x2="110" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="50" y2="70" x2="50" />
+        <rect width="100" x="60" y="30" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="-33" y2="22" x2="-47" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="280" y2="20" x2="287" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-70" y2="70" x2="-70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="60" y2="90" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="66" x1="134" y2="66" x2="150" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="66" x1="134" y2="61" x2="134" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="70" y2="-40" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="66" x1="150" y2="46" x2="150" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="66" x1="93" y2="66" x2="110" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="62" x1="93" y2="66" x2="93" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="51" x1="134" y2="46" x2="134" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="-60" y2="-40" x2="-60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="210" y2="-40" x2="210" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="30" y2="70" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="100" y2="90" x2="100" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="270" y2="90" x2="270" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="240" y2="40" x2="240" y3="20" x3="236" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="10" y2="22" x2="30" />
+        <polygon x4="-36" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="22" x1="-36" y2="18" x2="-44" y3="25" x3="-44" y4="22" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="-30" y2="22" x2="-15" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="-36" y2="26" x2="-36" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="-70" y2="-40" x2="-70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="230" y2="90" x2="230" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="80" y2="90" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="160" y2="-40" x2="160" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="110" y2="30" x2="110" />
+        <text x="22" y="83.3333" size="7" text="T22" />
+        <text x="42" y="83.3333" size="7" text="T23" />
+        <text x="185" y="2.66667" size="4" text="K1" />
+        <text x="185" y="31.6667" size="4" text="K2" />
+        <arc width="5" x="-72.25" y="32" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <text x="42" y="-47.6667" size="7" text="T12" />
+        <arc width="5" x="-65.25" y="7" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <arc width="5" x="-72.25" y="7" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <arc width="5" x="-65.25" y="32" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <text x="22" y="-47.6667" size="7" text="T13" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="30" x1="150" y2="20" x2="150" y3="-2" x3="156" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="157" y2="0" x2="150" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="150" y2="-10" x2="150" y3="-32" x3="156" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="150" y2="-30" x2="157" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="20" y2="90" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="40" y2="90" x2="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="-50" y2="12" x2="-46" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="-35" y2="12" x2="-31" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-33" y2="14" x2="-33" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="1" x1="198" y2="1" x2="237" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="140" y2="-40" x2="140" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="190" y2="-40" x2="190" />
+        <polygon x4="-30" y5="32" x5="-40" y6="22" x6="-50" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="22" x1="-50" y2="22" x2="-50" y3="12" x3="-40" y4="22" />
+        <arc width="5" x="-72.25" y="27" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="190" y2="70" x2="190" />
+        <arc width="5" x="-65.25" y="22" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <arc width="5" x="-65.25" y="12" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <arc width="5" x="-65.25" y="17" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <arc width="5" x="-72.25" y="12" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <arc width="5" x="-72.25" y="22" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <arc width="5" x="-72.25" y="17" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
+        <text x="234" y="-47.6667" size="7" text="23" />
+        <text x="141" y="9.66667" size="4" text="K2" />
+        <text x="141" y="-20.3333" size="4" text="K1" />
+        <text x="274" y="83.3333" size="7" text="32" />
+        <arc width="5" x="-65.25" y="27" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="30" x1="198" y2="30" x2="282.5" />
+        <text x="63" y="83.3333" size="7" text="T21" />
+        <text x="-4" y="35.3333" size="7" text="T" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="30" x1="-15" y2="30" x2="-10" y3="14" x3="10" />
+        <rect width="20" x="83" y="52" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <rect width="20" x="124" y="51" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="234" y="83.3333" size="7" text="24" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="150" y2="-30" x2="150" />
+        <rect width="390" x="-80" y="-60" antialias="false" height="150" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="105" y="-47.6667" size="7" text="Y1" />
+        <text x="195" y="83.3333" size="7" text="14" />
+        <text x="144" y="-47.6667" size="7" text="Y2" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="240" y2="10" x2="240" y3="-10" x3="235" />
+        <text x="275" y="-47.6667" size="7" text="31" />
+        <text x="195" y="-47.6667" size="7" text="13" />
+        <text x="-38" y="-14.3333" size="9" text="XPS BC" />
+        <rect width="25" x="-15" y="17" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-80" y2="70" x2="310" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="-80" y2="-40" x2="310" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="200" y2="10" x2="200" y3="-10" x3="195" />
+        <text x="101" y="83.3333" size="7" text="S22" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-60" y2="90" x2="-60" />
+        <text x="64" y="40" size="6" text="Logic" />
+        <text x="63" y="-47.6667" size="7" text="T11" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="250" y2="90" x2="250" />
+        <text x="-75" y="83.3333" size="7" text="A2" />
+        <text x="-76" y="-47.6667" size="7" text="A1" />
+        <text x="84" y="67.6667" size="4" text="K1" />
+        <text x="125" y="66.6667" size="4" text="K2" />
+        <terminal x="30" y="90" orientation="s" />
+        <terminal x="50" y="90" orientation="s" />
+        <terminal x="30" y="-60" orientation="n" />
+        <terminal x="50" y="-60" orientation="n" />
+        <terminal x="200" y="-60" orientation="n" />
+        <terminal x="200" y="90" orientation="s" />
+        <terminal x="-70" y="-60" orientation="n" />
+        <terminal x="-70" y="90" orientation="s" />
+        <terminal x="110" y="90" orientation="s" />
+        <terminal x="240" y="90" orientation="s" />
+        <terminal x="150" y="-60" orientation="n" />
+        <terminal x="240" y="-60" orientation="n" />
+        <terminal x="280" y="90" orientation="s" />
+        <terminal x="110" y="-60" orientation="n" />
+        <terminal x="70" y="-60" orientation="n" />
+        <terminal x="70" y="90" orientation="s" />
+        <terminal x="280" y="-60" orientation="n" />
+    </description>
+</definition>

Copied: branches/0.3/elements/blocs_de_securite/preventa/xps_bf.elmt (from rev 1060, branches/0.3/elements/blocs_de_securite/xps_bf.elmt)
===================================================================
--- branches/0.3/elements/blocs_de_securite/preventa/xps_bf.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/preventa/xps_bf.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,114 @@
+<definition width="360" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
+    <names>
+        <name lang="en" >XPS-BF</name>
+        <name lang="fr" >XPS-BF</name>
+        <name lang="pl" >XPS-BF</name>
+        <name lang="cs" >XPS-BF</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="45" x1="210" y2="45" x2="267" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="15" x1="210" y2="15" x2="267" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="160" y2="0" x2="160" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="170" y2="-9.99997" x2="170" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="150" y2="-9.99997" x2="150" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="240" y2="90" x2="240" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="260" y2="-9.99997" x2="260" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="70" y2="60" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="240" y2="-9.99997" x2="240" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="260" y2="90" x2="260" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="130" y2="-9.99997" x2="130" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="90" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="110" y2="-9.99997" x2="110" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-10" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-40" y2="20" x2="-20" />
+        <rect width="170" x="10" y="0" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="40" y2="-10" x2="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-20" y2="25" x2="10" />
+        <text x="-39" y="24.3333" size="4" text="DC" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="200" y2="25" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="-50" y2="35" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="50" y2="0" x2="50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="70" y2="0" x2="70" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="120" y2="0" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="200" y2="55" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-50" y2="25" x2="-50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="60" y2="-10" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="60" y2="70" x2="60" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="-20" y2="35" x2="10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="-50" y2="70" x2="-50" />
+        <rect width="20" x="-40" y="20" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="50" y2="60" x2="50" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="30" y2="60" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="30" y2="0" x2="30" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="120" y2="70" x2="120" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="160" y2="70" x2="160" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-50" y2="15" x2="10" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-50" y2="25" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5.00003" x1="200" y2="5.00003" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="200" y2="25" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="170" y2="90" x2="170" />
+        <text x="-29" y="38.3333" size="4" text="DC" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="200" y2="35" x2="180" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5.00003" x1="200" y2="10" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="200" y2="40" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="200" y2="55" x2="200" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="150" y2="90" x2="150" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="80" y2="-10" x2="80" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="130" y2="90" x2="130" />
+        <text x="62" y="-16.6667" size="7" text="S13" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="110" y2="90" x2="110" />
+        <text x="154" y="82.3333" size="7" text="Y2" />
+        <text x="114" y="82.3333" size="7" text="Y1" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="20" y2="90" x2="20" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="40" y2="90" x2="40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="220" y2="-9.99997" x2="220" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="80" y2="70" x2="80" />
+        <text x="23" y="-16.6667" size="7" text="S11" />
+        <text x="224" y="83.3333" size="7" text="14" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="230" y2="-10" x2="230" />
+        <text x="22" y="82.3333" size="7" text="S21" />
+        <rect width="20" x="190" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <rect width="20" x="190" y="10" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <rect width="340" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
+        <text x="154" y="-16.6667" size="7" text="Y2" />
+        <text x="61" y="83.3333" size="7" text="S23" />
+        <text x="265" y="-17.6667" size="7" text="23" />
+        <text x="265" y="83.3333" size="7" text="24" />
+        <text x="42" y="-16.6667" size="7" text="S12" />
+        <text x="225" y="-17.6667" size="7" text="13" />
+        <text x="-38" y="6.66667" size="9" text="XPS BF" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="270" y2="-10" x2="270" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="280" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="280" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="230" y2="26" x2="230" y3="6" x3="225" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="270" y2="26" x2="270" y3="6" x3="265" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="230" y2="55" x2="230" y3="35" x3="225" />
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="270" y2="55" x2="270" y3="35" x3="265" />
+        <text x="42" y="83.3333" size="7" text="S22" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-40" y2="-11" x2="-40" />
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
+        <text x="14" y="31" size="6" text="Logic" />
+        <text x="114" y="-16.6667" size="7" text="Y1" />
+        <text x="-56" y="82.3333" size="7" text="A2" />
+        <text x="-56" y="-16.6667" size="7" text="A1" />
+        <text x="205" y="7.33336" size="4" text="K1" />
+        <text x="205" y="37.3333" size="4" text="K2" />
+        <terminal x="70" y="-30" orientation="n" />
+        <terminal x="120" y="90" orientation="s" />
+        <terminal x="160" y="90" orientation="s" />
+        <terminal x="230" y="-30" orientation="n" />
+        <terminal x="70" y="90" orientation="s" />
+        <terminal x="-50" y="-30" orientation="n" />
+        <terminal x="-50" y="90" orientation="s" />
+        <terminal x="50" y="90" orientation="s" />
+        <terminal x="270" y="-30" orientation="n" />
+        <terminal x="30" y="-30" orientation="n" />
+        <terminal x="50" y="-30" orientation="n" />
+        <terminal x="230" y="90" orientation="s" />
+        <terminal x="160" y="-30" orientation="n" />
+        <terminal x="120" y="-30" orientation="n" />
+        <terminal x="270" y="90" orientation="s" />
+        <terminal x="30" y="90" orientation="s" />
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/sick/qet_directory
===================================================================
--- branches/0.3/elements/blocs_de_securite/sick/qet_directory	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/sick/qet_directory	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,7 @@
+<qet-directory>
+    <names>
+	<name lang="en" >Sick</name>
+        <name lang="fr" >Sick</name>
+        <name lang="pl" >Sick</name>
+    </names>
+</qet-directory>

Added: branches/0.3/elements/blocs_de_securite/sick/ue410-2ro.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/sick/ue410-2ro.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/sick/ue410-2ro.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,62 @@
+<definition width="220" version="0.22" hotspot_x="70" hotspot_y="40" height="110" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">UE410-2RO</name>
+        <name lang="fr">UE410-2RO</name>
+        <name lang="pl">UE410-2RO</name>
+        <name lang="cs">UE410-2RO</name>
+    </names>
+    <informations>TELEMECANIQUE</informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-60" y2="58" x2="37"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="63" y2="58" x2="77"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="43" y2="58" x2="57"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="15" x1="51" y2="15" x2="117"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="40" y2="24" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="103" y2="58" x2="140"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="58" x1="120" y2="25" x2="120" y3="5" x3="115"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="80" y2="25" x2="80" y3="4" x3="85"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="60" y2="25" x2="60" y3="5" x3="55"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="80" y2="4" x2="80"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="60" y2="5" x2="60"/>
+        <input x="126" y="59" size="7" rotation="270" rotate="true" text="Int."/>
+        <input x="115" y="59" size="7" rotation="270" rotate="true" text="+24V"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="120" y2="5" x2="120"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="55" x1="100" y2="25" x2="100" y3="5" x3="95"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="103" y2="-28" x2="117"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="100" y2="5" x2="100"/>
+        <input x="115" y="-4" size="7" rotation="270" rotate="true" text="Y14"/>
+        <circle x="117.764" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="80" y2="5" x2="86"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="123" y2="-28" x2="140"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="83" y2="58" x2="97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="140" y2="58" x2="140"/>
+        <input x="75" y="59" size="7" rotation="270" rotate="true" text="14"/>
+        <circle x="77.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="63" y2="-28" x2="77"/>
+        <circle x="97.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="55" y="-9" size="7" rotation="270" text="Y1"/>
+        <rect width="22" x="29" y="7" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="83" y2="-28" x2="97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="58" x2="-60"/>
+        <circle x="57.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="95" y="-11" size="7" rotation="270" rotate="true" text="23"/>
+        <circle x="77.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="55" y="59" size="7" rotation="270" rotate="true" text="Y2"/>
+        <input x="75" y="-11" size="7" rotation="270" rotate="true" text="13"/>
+        <input x="35" y="59" size="7" rotation="270" rotate="true" text="B1"/>
+        <circle x="37.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="57.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="97.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="95" y="59" size="7" rotation="270" rotate="true" text="24"/>
+        <text x="-51" y="19" size="9" text="UE410-2RO"/>
+        <terminal x="40" y="61" orientation="s"/>
+        <terminal x="60" y="61" orientation="s"/>
+        <terminal x="80" y="-31" orientation="n"/>
+        <terminal x="60" y="-31" orientation="n"/>
+        <terminal x="80" y="61" orientation="s"/>
+        <terminal x="100" y="61" orientation="s"/>
+        <terminal x="100" y="-31" orientation="n"/>
+        <terminal x="120" y="-31" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/sick/ue410-mu.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/sick/ue410-mu.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/sick/ue410-mu.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,80 @@
+<definition width="200" version="0.22" hotspot_x="70" hotspot_y="40" height="110" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">UE410-MU</name>
+        <name lang="fr">UE410-MU</name>
+        <name lang="pl">UE410-MU</name>
+        <name lang="cs">UE410-MU</name>
+    </names>
+    <informations>TELEMECANIQUE</informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="83" y2="-28" x2="97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="103" y2="58" x2="120"/>
+        <input x="100" y="-10" size="7" rotation="270" rotate="true" text="S3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="23" y2="58" x2="37"/>
+        <circle x="97.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-17" y2="58" x2="-3"/>
+        <circle x="97.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="3" y2="58" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="83" y2="58" x2="97"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="120" y2="58" x2="120"/>
+        <input x="100" y="59" size="7" rotation="270" rotate="true" text="Q4"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="103" y2="-28" x2="120"/>
+        <input x="20" y="59" size="7" rotation="270" rotate="true" text="A2"/>
+        <input x="0" y="59" size="7" rotation="270" rotate="true" text="EN"/>
+        <circle x="-2.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="17.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="63" y2="-28" x2="77"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="3" y2="-28" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-17" y2="-28" x2="-3"/>
+        <circle x="37.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-37" y2="58" x2="-23"/>
+        <input x="-20" y="-13" size="7" rotation="270" rotate="true" text="I2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="23" y2="-28" x2="37"/>
+        <circle x="57.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="58" x2="-60"/>
+        <input x="80" y="-10" size="7" rotation="270" rotate="true" text="S2"/>
+        <circle x="-22.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="20" y="-11" size="7" rotation="270" rotate="true" text="X2"/>
+        <circle x="77.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-60" y2="58" x2="-43"/>
+        <circle x="77.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-37" y2="-28" x2="-23"/>
+        <circle x="17.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-20" y="59" size="7" rotation="270" rotate="true" text="I4"/>
+        <input x="0" y="-11" size="7" rotation="270" rotate="true" text="X1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="43" y2="-28" x2="57"/>
+        <input x="-40" y="59" size="7" rotation="270" rotate="true" text="I3"/>
+        <circle x="-2.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="60" y="-10" size="7" rotation="270" rotate="true" text="S1"/>
+        <circle x="-42.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="40" y="-10" size="7" rotation="270" rotate="true" text="A1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="63" y2="58" x2="77"/>
+        <circle x="-22.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="-43"/>
+        <circle x="57.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="43" y2="58" x2="57"/>
+        <circle x="37.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-40" y="-13" size="7" rotation="270" rotate="true" text="I1"/>
+        <circle x="-42.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="80" y="59" size="7" rotation="270" rotate="true" text="Q3"/>
+        <input x="60" y="59" size="7" rotation="270" rotate="true" text="Q2"/>
+        <input x="40" y="59" size="7" rotation="270" rotate="true" text="Q1"/>
+        <text x="-51" y="19" size="9" text="UE410-MU"/>
+        <terminal x="-40" y="61" orientation="s"/>
+        <terminal x="-20" y="61" orientation="s"/>
+        <terminal x="40" y="61" orientation="s"/>
+        <terminal x="60" y="61" orientation="s"/>
+        <terminal x="80" y="61" orientation="s"/>
+        <terminal x="-40" y="-31" orientation="n"/>
+        <terminal x="40" y="-31" orientation="n"/>
+        <terminal x="60" y="-31" orientation="n"/>
+        <terminal x="20" y="-31" orientation="n"/>
+        <terminal x="0" y="-31" orientation="n"/>
+        <terminal x="-20" y="-31" orientation="n"/>
+        <terminal x="80" y="-31" orientation="n"/>
+        <terminal x="0" y="61" orientation="s"/>
+        <terminal x="20" y="61" orientation="s"/>
+        <terminal x="100" y="61" orientation="s"/>
+        <terminal x="100" y="-31" orientation="n"/>
+    </description>
+</definition>

Added: branches/0.3/elements/blocs_de_securite/sick/ue410-xu.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/sick/ue410-xu.elmt	                        (rev 0)
+++ branches/0.3/elements/blocs_de_securite/sick/ue410-xu.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -0,0 +1,80 @@
+<definition width="200" version="0.22" hotspot_x="70" hotspot_y="40" height="110" type="element" ic="true" orientation="dyyy">
+    <names>
+        <name lang="en">UE410-XU</name>
+        <name lang="fr">UE410-XU</name>
+        <name lang="pl">UE410-XU</name>
+        <name lang="cs">UE410-XU</name>
+    </names>
+    <informations>TELEMECANIQUE</informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="103" y2="58" x2="120"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="103" y2="-28" x2="120"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="23" y2="58" x2="37"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="3" y2="58" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-17" y2="58" x2="-3"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="120" y2="58" x2="120"/>
+        <input x="20" y="59" size="7" rotation="270" rotate="true" text="A2"/>
+        <input x="20" y="-11" size="7" rotation="270" rotate="true" text="X2"/>
+        <circle x="17.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="-2.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="63" y2="-28" x2="77"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="3" y2="-28" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-17" y2="-28" x2="-3"/>
+        <circle x="37.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-37" y2="58" x2="-23"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="83" y2="-28" x2="97"/>
+        <input x="-20" y="-13" size="7" rotation="270" rotate="true" text="I2"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="23" y2="-28" x2="37"/>
+        <circle x="57.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="58" x2="-60"/>
+        <input x="80" y="-10" size="7" rotation="270" rotate="true" text="S2"/>
+        <circle x="-22.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="0" y="-11" size="7" rotation="270" rotate="true" text="X1"/>
+        <circle x="77.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="-60" y2="58" x2="-43"/>
+        <circle x="77.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-37" y2="-28" x2="-23"/>
+        <circle x="17.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="97.7639" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-20" y="59" size="7" rotation="270" rotate="true" text="I4"/>
+        <input x="0" y="59" size="7" rotation="270" rotate="true" text="EN"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="43" y2="-28" x2="57"/>
+        <input x="-40" y="59" size="7" rotation="270" rotate="true" text="I3"/>
+        <circle x="-2.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="60" y="-10" size="7" rotation="270" rotate="true" text="S1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="83" y2="58" x2="97"/>
+        <circle x="-42.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="100" y="-10" size="7" rotation="270" rotate="true" text="S3"/>
+        <input x="40" y="-10" size="7" rotation="270" rotate="true" text="A1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="63" y2="58" x2="77"/>
+        <circle x="-22.2361" y="55.7639" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-28" x1="-60" y2="-28" x2="-43"/>
+        <circle x="97.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <circle x="57.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="58" x1="43" y2="58" x2="57"/>
+        <circle x="37.7639" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="-40" y="-13" size="7" rotation="270" rotate="true" text="I1"/>
+        <circle x="-42.2361" y="-30.2361" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4.47214"/>
+        <input x="100" y="59" size="7" rotation="270" rotate="true" text="Q4"/>
+        <input x="80" y="59" size="7" rotation="270" rotate="true" text="Q3"/>
+        <input x="60" y="59" size="7" rotation="270" rotate="true" text="Q2"/>
+        <input x="40" y="59" size="7" rotation="270" rotate="true" text="Q1"/>
+        <text x="-51" y="19" size="9" text="UE410-XU"/>
+        <terminal x="-40" y="61" orientation="s"/>
+        <terminal x="-20" y="61" orientation="s"/>
+        <terminal x="40" y="61" orientation="s"/>
+        <terminal x="60" y="61" orientation="s"/>
+        <terminal x="80" y="61" orientation="s"/>
+        <terminal x="100" y="61" orientation="s"/>
+        <terminal x="-40" y="-31" orientation="n"/>
+        <terminal x="40" y="-31" orientation="n"/>
+        <terminal x="60" y="-31" orientation="n"/>
+        <terminal x="20" y="-31" orientation="n"/>
+        <terminal x="0" y="-31" orientation="n"/>
+        <terminal x="-20" y="-31" orientation="n"/>
+        <terminal x="100" y="-31" orientation="n"/>
+        <terminal x="80" y="-31" orientation="n"/>
+        <terminal x="0" y="61" orientation="s"/>
+        <terminal x="20" y="61" orientation="s"/>
+    </description>
+</definition>

Deleted: branches/0.3/elements/blocs_de_securite/xps-al.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/xps-al.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/xps-al.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,113 +0,0 @@
-<definition width="320" version="0.2" hotspot_x="70" hotspot_y="40" height="140" type="element" orientation="dyyy" >
-    <names>
-        <name lang="en" >XPS-AL</name>
-        <name lang="fr" >XPS-AL</name>
-        <name lang="pl" >XPS-AL</name>
-        <name lang="cs" >XPS-AL</name>
-    </names>
-    <description>
-        <rect width="15" x="73.5" y="55.5" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="15" x="29" y="56" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="230" x2="230" x3="227" x4="226" antialias="false" x5="226" x6="230" x7="230" x8="230" x9="230" closed="false" y1="-10" y2="24" y3="27" y4="28" y5="31" y6="35" y7="69" y8="70" y9="69" />
-        <rect width="300" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="229" y2="35" x2="228" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="230" y2="33" x2="230" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="226" y2="23" x2="226" />
-        <text x="42" y="38.3333" size="4" text="K1/K2" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="44" x1="70" y2="44" x2="68" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="44" x1="70" y2="41" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="40" x1="67" y2="44" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="39" x1="60" y2="39" x2="66" />
-        <polygon x4="60" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="35" x1="60" y2="35" x2="66" y3="39" x3="63" y4="35" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="32" x1="63" y2="42" x2="63" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="43.95" x1="73.45" y2="43.95" x2="71.45" />
-        <rect width="76" x="20" y="9" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="43.95" x1="73.45" y2="40.95" x2="73.45" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="39.95" x1="70.45" y2="43.95" x2="73.45" />
-        <text x="45" y="22" size="6" text="LOGIC" />
-        <text x="79" y="61.3333" size="4" text="K2" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="36" y2="49" x2="36" />
-        <text x="34" y="61.3333" size="4" text="K1" />
-        <text x="13" y="-17.3333" size="8" text="Y1" />
-        <text x="82" y="-17.3333" size="8" text="Y2" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="80" y2="-11" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="100" y2="-11" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="30" y2="-11" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="10" y2="-11" x2="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-29" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="140" y2="-29" x2="140" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="160" y2="-29" x2="160" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="180" y2="-29" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="200" y2="-30" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="89" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="10" y2="45" x2="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="90" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="180" y2="89" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="160" y2="89" x2="160" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="140" y2="89" x2="140" />
-        <text x="3" y="82.6667" size="8" text="PE" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="20" y2="90" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="0" y2="90" x2="0" />
-        <text x="-57" y="82.6667" size="8" text="A2" />
-        <text x="-57" y="-18.3333" size="8" text="A1" />
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="29" x1="-45" y2="29" x2="-50" y3="-10" x3="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-16" y2="30" x2="-22" />
-        <polygon x4="-26" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="37" x1="-41" y2="37" x2="-38" y3="20" x3="-26" y4="21" />
-        <rect width="22" x="-44" y="26" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <polygon x4="-50" y5="70" x5="-50" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="30" x1="4" y2="50" x2="4" y3="50" x3="-50" y4="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="89" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-40" y2="-29" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-6" y2="41" x2="-6" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="13" y2="44" x2="13" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="13" y2="14" x2="13" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34" x1="19" y2="34" x2="18" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34" x1="19" y2="33" x2="19" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="33" x1="18" y2="34" x2="19" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="34" x1="11" y2="34" x2="15" />
-        <polygon x4="13" y5="31" x5="11" y6="31" x6="11" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="31" x1="11" y2="31" x2="15" y3="31" x3="15" y4="34" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28" x1="13" y2="37" x2="13" />
-        <rect width="4" x="11" y="18" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="36" x1="18" y2="36" x2="17" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="36" x1="18" y2="35" x2="18" />
-        <polygon x4="-6" y5="28" x5="-8" y6="28" x6="-4" y7="28" x7="-5" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="28" x1="-6" y2="31" x2="-8" y3="31" x3="-4" y4="28" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="35" x1="17" y2="36" x2="18" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="24" x1="-6" y2="33" x2="-6" />
-        <polygon x4="20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="41" x1="-6" y2="45" x2="-6" y3="45" x3="20" y4="45" />
-        <polygon x4="20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="-6" y2="13" x2="-6" y3="13" x3="20" y4="13" />
-        <polygon x4="68" y5="49" x5="68" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="63" x1="81" y2="66" x2="81" y3="66" x3="68" y4="49" />
-        <polygon x4="50" y5="49" x5="50" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="63" x1="36" y2="66" x2="36" y3="66" x3="50" y4="49" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="80" y2="49" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="10" x1="140" y2="10" x2="187" />
-        <text x="132" y="10.3333" size="4" text="K1" />
-        <polygon x4="4" y5="20" x5="-6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="-6" y2="30" x2="-16" y3="40" x3="-6" y4="30" />
-        <text x="131" y="53.3333" size="4" text="K2" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="52.95" x1="140.45" y2="52.95" x2="187.45" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.5" x1="-59.0625" y2="-10.5" x2="238.938" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="185" y2="60" x2="190" y3="70" x3="190" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="165" y2="60" x2="170" y3="70" x3="170" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="145" y2="60" x2="150" y3="70" x3="150" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="145.375" y2="20" x2="150" y3="30" x3="150" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="239" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="185.375" y2="20" x2="190" y3="30" x3="190" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="165.375" y2="20" x2="170" y3="30" x3="170" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="190" y2="40" x2="190" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="170" y2="40" x2="170" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="150" y2="40" x2="150" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="150.375" y2="0" x2="150.375" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="190.375" y2="0" x2="190.375" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="170.375" y2="0" x2="170.375" />
-        <terminal x="-50" y="-34" orientation="n" />
-        <terminal x="-50" y="94" orientation="s" />
-        <terminal x="10" y="94" orientation="s" />
-        <terminal x="150" y="94" orientation="s" />
-        <terminal x="170" y="94" orientation="s" />
-        <terminal x="190" y="94" orientation="s" />
-        <terminal x="150" y="-34" orientation="n" />
-        <terminal x="170" y="-34" orientation="n" />
-        <terminal x="190" y="-34" orientation="n" />
-        <terminal x="230" y="-34" orientation="n" />
-        <terminal x="230" y="94" orientation="s" />
-        <terminal x="20" y="-34" orientation="n" />
-        <terminal x="90" y="-34" orientation="n" />
-    </description>
-</definition>

Deleted: branches/0.3/elements/blocs_de_securite/xps_ac.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/xps_ac.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/xps_ac.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,134 +0,0 @@
-<definition width="360" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
-    <names>
-        <name lang="en" >XPS-AC</name>
-        <name lang="fr" >XPS-AC</name>
-        <name lang="pl" >XPS-AC</name>
-        <name lang="cs" >XPS-AC</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36" x1="10" y2="36" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="10" y2="36" x2="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="5" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="5" x2="10" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="29" x1="262" y2="21" x2="270" y3="-10" x3="270" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="270" y2="39" x2="270" />
-        <polygon x4="269" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="36" x1="269" y2="39" x2="270" y3="38" x3="267" y4="36" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="39" x1="270" y2="31" x2="262" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="262" y2="30" x2="253" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="262" y2="34" x2="262" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="30" y2="90" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="50" y2="90" x2="50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-43" y2="60" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-8" y2="20" x2="0" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-50" y2="60" x2="-50" />
-        <text x="-46" y="67" size="6" text="48V, 115V, 230V" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-43" y2="20" x2="-43" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="14" y2="10" x2="18" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="20" y2="20" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="30" y2="60" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-43" y2="20" x2="-33" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="14" y2="30" x2="18" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="16" y2="12" x2="16" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="40" y2="36" x2="40" />
-        <rect width="60" x="60" y="0" antialias="false" height="41" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="14" x1="147" y2="14" x2="226" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="100" y2="65" x2="115" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="160" y2="-10" x2="160" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="140" y2="-10" x2="140" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="100" y2="41" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="70" y2="41" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="85" y2="65" x2="85" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-50" y2="-10" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="70" y2="65" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="115" y2="65" x2="115" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="70" y2="65" x2="85" />
-        <polygon x4="20" y5="30" x5="10" y6="20" x6="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="20" x2="0" y3="10" x3="10" y4="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="160" y2="70" x2="160" />
-        <arc width="5" x="-52.25" y="55" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="140" y2="70" x2="140" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="100" y2="65" x2="100" />
-        <polygon x4="6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="24" x1="6" y2="24" x2="14" y3="16" x3="10" y4="24" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="27" x1="10" y2="13" x2="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="16" x1="6" y2="16" x2="13" />
-        <arc width="5" x="-45.25" y="50" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <arc width="5" x="-45.25" y="40" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <arc width="5" x="-45.25" y="45" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <arc width="5" x="-52.25" y="40" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <arc width="5" x="-52.25" y="50" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <arc width="5" x="-52.25" y="45" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <text x="225" y="-16.6667" size="7" text="24" />
-        <text x="138" y="44.3333" size="4" text="K2" />
-        <text x="139" y="16.3333" size="4" text="K1" />
-        <text x="224" y="83.3333" size="7" text="34" />
-        <arc width="5" x="-45.25" y="55" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="43" x1="147" y2="43" x2="226" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="230" y2="-10" x2="230" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="150" y2="-10" x2="150" />
-        <text x="34" y="82.3333" size="7" text="PE" />
-        <text x="-23" y="33.3333" size="7" text="T" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="28" x1="-33" y2="28" x2="-28" y3="12" x3="-8" />
-        <rect width="20" x="60" y="50" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="20" x="90" y="50" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="185" y="82.3333" size="7" text="24" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="70" y2="0" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="110" y2="0" x2="110" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="240" y2="89" x2="240" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="260" y2="89" x2="260" />
-        <rect width="340" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="104" y="-16.6667" size="7" text="Y2" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="100" y2="-11" x2="100" />
-        <text x="145" y="83.3333" size="7" text="14" />
-        <text x="185" y="-16.6667" size="7" text="23" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="230" y2="26" x2="230" y3="6" x3="225" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="230" y2="55" x2="230" y3="35" x3="225" />
-        <text x="262" y="82.3333" size="7" text="Y44" />
-        <text x="262" y="-16.6667" size="7" text="Y43" />
-        <text x="145" y="-16.6667" size="7" text="13" />
-        <text x="-38" y="6.66667" size="9" text="XPS AC" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="260" y2="-11" x2="260" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="120" y2="-11" x2="120" />
-        <rect width="25" x="-33" y="15" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="190" y2="-10" x2="190" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="280" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="280" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="150" y2="26" x2="150" y3="6" x3="145" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="190" y2="26" x2="190" y3="6" x3="185" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="150" y2="55" x2="150" y3="35" x3="145" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="190" y2="55" x2="190" y3="35" x3="185" />
-        <text x="102" y="82.3333" size="7" text="S22" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="120" y2="89" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="100" y2="89" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-40" y2="-11" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
-        <text x="64" y="23" size="6" text="Logic" />
-        <text x="64" y="-16.6667" size="7" text="Y1" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="60" y2="-11" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="80" y2="-10" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="240" y2="-29" x2="240" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="180" y2="-29" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="200" y2="-29" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-30" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="89" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="90" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="180" y2="89" x2="180" />
-        <text x="-56" y="82.3333" size="7" text="A2" />
-        <text x="-56" y="-16.6667" size="7" text="A1" />
-        <text x="62" y="65.3333" size="4" text="K1" />
-        <text x="92" y="65.3333" size="4" text="K2" />
-        <terminal x="150" y="-30" orientation="n" />
-        <terminal x="150" y="90" orientation="s" />
-        <terminal x="-50" y="-30" orientation="n" />
-        <terminal x="-50" y="90" orientation="s" />
-        <terminal x="110" y="90" orientation="s" />
-        <terminal x="190" y="90" orientation="s" />
-        <terminal x="190" y="-30" orientation="n" />
-        <terminal x="230" y="-30" orientation="n" />
-        <terminal x="270" y="-30" orientation="n" />
-        <terminal x="230" y="90" orientation="s" />
-        <terminal x="110" y="-30" orientation="n" />
-        <terminal x="70" y="-30" orientation="n" />
-        <terminal x="270" y="90" orientation="s" />
-        <terminal x="40" y="90" orientation="s" />
-    </description>
-</definition>

Deleted: branches/0.3/elements/blocs_de_securite/xps_af.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/xps_af.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/xps_af.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,119 +0,0 @@
-<definition width="360" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
-    <names>
-        <name lang="en" >XPS-AF</name>
-        <name lang="fr" >XPS-AF</name>
-        <name lang="pl" >XPS-AF</name>
-        <name lang="cs" >XPS-AF</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="16" y2="5" x2="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-50" y2="5" x2="-15" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-50" y2="5" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="270" y2="-10" x2="270" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="110" y2="60" x2="110" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="130" y2="35" x2="116" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="190" y2="-10" x2="190" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="16" y2="5" x2="16" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-10" y2="40" x2="16" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-10" y2="40" x2="-10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="10" y2="65" x2="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="24" y2="55" x2="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-50" y2="65" x2="-50" />
-        <text x="-5" y="18.3333" size="7" text="T" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="13" x1="-15" y2="13" x2="-10" y3="-3" x3="10" />
-        <rect width="20" x="120" y="10" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="20" x="120" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="130" y2="21" x2="130" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="130" y2="35" x2="130" />
-        <text x="225" y="82.3333" size="7" text="24" />
-        <rect width="92" x="24" y="0" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="70" y2="0" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="110" y2="0" x2="110" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="240" y2="89" x2="240" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="260" y2="89" x2="260" />
-        <rect width="340" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="102" y="-16.6667" size="7" text="S39" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="100" y2="-11" x2="100" />
-        <text x="184" y="82.3333" size="7" text="14" />
-        <text x="225" y="-16.6667" size="7" text="23" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="270" y2="25" x2="270" y3="5" x3="265" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="270" y2="55" x2="270" y3="35" x3="265" />
-        <text x="265" y="82.3333" size="7" text="34" />
-        <text x="265" y="-16.6667" size="7" text="33" />
-        <text x="184" y="-16.6667" size="7" text="13" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="130" y2="5" x2="130" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="130" y2="26" x2="116" />
-        <text x="-56" y="36.6667" size="9" text="XPS AF" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="260" y2="-11" x2="260" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="120" y2="-11" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-11" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="130" y2="5" x2="116" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="30" y2="0" x2="30" />
-        <polygon x4="-30" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="5" x1="-30" y2="0" x2="-40" y3="10" x3="-40" y4="5" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="30" y2="61" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="70" y2="65" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="10" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="70" y2="65" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="130" y2="56" x2="116" />
-        <rect width="25" x="-15" y="0" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="130" y2="51" x2="130" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="230" y2="-10" x2="230" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="15" x1="140" y2="15" x2="267" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="280" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="280" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="40" y2="-11" x2="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="45" x1="140" y2="45" x2="267" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="190" y2="25" x2="190" y3="5" x3="185" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="230" y2="25" x2="230" y3="5" x3="225" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="190" y2="55" x2="190" y3="35" x3="185" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="231" y2="55" x2="231" y3="35" x3="226" />
-        <text x="102" y="82.3333" size="7" text="S22" />
-        <text x="62" y="82.3333" size="7" text="S21" />
-        <text x="22" y="82.3333" size="7" text="S12" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-11" x2="0" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-20" y2="-11" x2="-20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="120" y2="89" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="100" y2="89" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="80" y2="89" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="60" y2="89" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="40" y2="89" x2="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="0" y2="89" x2="0" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-40" y2="-11" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
-        <text x="29" y="32" size="6" text="Logic" />
-        <text x="22" y="-16.6667" size="7" text="S33" />
-        <text x="62" y="-16.6667" size="7" text="S34" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="60" y2="-11" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="80" y2="-10" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="240" y2="-29" x2="240" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="180" y2="-29" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="200" y2="-29" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-30" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="89" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="90" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="180" y2="89" x2="180" />
-        <text x="-17" y="82.3333" size="7" text="S11" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="20" y2="90" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-20" y2="90" x2="-20" />
-        <text x="-55" y="82.3333" size="7" text="A2" />
-        <text x="-56" y="-16.6667" size="7" text="A1" />
-        <text x="133" y="7.33333" size="4" text="K1" />
-        <text x="132" y="37.3333" size="4" text="K2" />
-        <terminal x="30" y="-30" orientation="n" />
-        <terminal x="-50" y="-30" orientation="n" />
-        <terminal x="-50" y="90" orientation="s" />
-        <terminal x="30" y="90" orientation="s" />
-        <terminal x="110" y="90" orientation="s" />
-        <terminal x="190" y="90" orientation="s" />
-        <terminal x="190" y="-30" orientation="n" />
-        <terminal x="230" y="-30" orientation="n" />
-        <terminal x="270" y="-30" orientation="n" />
-        <terminal x="230" y="90" orientation="s" />
-        <terminal x="110" y="-30" orientation="n" />
-        <terminal x="70" y="-30" orientation="n" />
-        <terminal x="-10" y="90" orientation="s" />
-        <terminal x="70" y="90" orientation="s" />
-        <terminal x="270" y="90" orientation="s" />
-    </description>
-</definition>

Deleted: branches/0.3/elements/blocs_de_securite/xps_afl.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/xps_afl.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/xps_afl.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,123 +0,0 @@
-<definition width="360" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
-    <names>
-        <name lang="en" >XPS-AFL</name>
-        <name lang="fr" >XPS-AFL</name>
-        <name lang="pl" >XPS-AFL</name>
-        <name lang="cs" >XPS-AFL</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="5" x2="15" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-50" y2="5" x2="-15" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-50" y2="5" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="15" y2="5" x2="15" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-10" y2="70" x2="-10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-10" y2="40" x2="15" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="130" y2="35" x2="116" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="70" y2="67" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="110" y2="60" x2="110" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="270" y2="-10" x2="270" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="-50" y2="70" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="190" y2="-10" x2="190" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="63" x1="50" y2="63" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="50" y2="63" x2="50" />
-        <text x="42" y="82.3333" size="7" text="S12" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="24" y2="55" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="67" x1="-10" y2="67" x2="70" />
-        <text x="-5" y="18.3333" size="7" text="T" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="13" x1="-15" y2="13" x2="-10" y3="-3" x3="10" />
-        <rect width="20" x="120" y="10" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="20" x="120" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="130" y2="21" x2="130" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="130" y2="35" x2="130" />
-        <text x="225" y="82.3333" size="7" text="24" />
-        <rect width="92" x="24" y="0" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="70" y2="0" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="110" y2="0" x2="110" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="240" y2="89" x2="240" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="260" y2="89" x2="260" />
-        <rect width="340" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="102" y="-16.6667" size="7" text="S39" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="100" y2="-11" x2="100" />
-        <text x="184" y="82.3333" size="7" text="14" />
-        <text x="225" y="-16.6667" size="7" text="23" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="270" y2="25" x2="270" y3="5" x3="265" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="270" y2="55" x2="270" y3="35" x3="265" />
-        <text x="263" y="82.3333" size="7" text="34" />
-        <text x="265" y="-16.6667" size="7" text="33" />
-        <text x="184" y="-16.6667" size="7" text="13" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="130" y2="5" x2="130" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="130" y2="26" x2="116" />
-        <text x="-57" y="33.6667" size="9" text="XPS AFL" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="260" y2="-11" x2="260" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="120" y2="-11" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-11" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="130" y2="5" x2="116" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="30" y2="0" x2="30" />
-        <polygon x4="-30" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="5" x1="-30" y2="0" x2="-40" y3="10" x3="-40" y4="5" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="213" y2="90" x2="206" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="30" y2="61" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="10" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="130" y2="56" x2="116" />
-        <rect width="25" x="-15" y="0" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="130" y2="51" x2="130" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="230" y2="-10" x2="230" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="15" x1="140" y2="15" x2="267" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="280" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="280" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="40" y2="-11" x2="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="45" x1="140" y2="45" x2="267" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="190" y2="25" x2="190" y3="5" x3="185" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="35" x1="230" y2="25" x2="230" y3="5" x3="225" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="190" y2="55" x2="190" y3="35" x3="185" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="231" y2="55" x2="231" y3="35" x3="226" />
-        <text x="102" y="82.3333" size="7" text="S22" />
-        <text x="62" y="82.3333" size="7" text="S11" />
-        <text x="22" y="82.3333" size="7" text="S12" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-11" x2="0" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-20" y2="-11" x2="-20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="120" y2="89" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="100" y2="89" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="80" y2="89" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="60" y2="89" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="40" y2="89" x2="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="0" y2="89" x2="0" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-40" y2="-11" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
-        <text x="29" y="32" size="6" text="Logic" />
-        <text x="22" y="-16.6667" size="7" text="S33" />
-        <text x="62" y="-16.6667" size="7" text="S34" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="60" y2="-11" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="80" y2="-10" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="240" y2="-29" x2="240" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="180" y2="-29" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="200" y2="-29" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-30" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="89" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="90" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="180" y2="89" x2="180" />
-        <text x="-17" y="82.3333" size="7" text="S11" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="20" y2="90" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-20" y2="90" x2="-20" />
-        <text x="-56" y="82.3333" size="7" text="A2" />
-        <text x="-56" y="-16.6667" size="7" text="A1" />
-        <text x="133" y="7.33333" size="4" text="K1" />
-        <text x="132" y="37.3333" size="4" text="K2" />
-        <terminal x="30" y="-30" orientation="n" />
-        <terminal x="-50" y="-30" orientation="n" />
-        <terminal x="-50" y="90" orientation="s" />
-        <terminal x="30" y="90" orientation="s" />
-        <terminal x="110" y="90" orientation="s" />
-        <terminal x="190" y="90" orientation="s" />
-        <terminal x="190" y="-30" orientation="n" />
-        <terminal x="230" y="-30" orientation="n" />
-        <terminal x="270" y="-30" orientation="n" />
-        <terminal x="230" y="90" orientation="s" />
-        <terminal x="110" y="-30" orientation="n" />
-        <terminal x="70" y="-30" orientation="n" />
-        <terminal x="-10" y="90" orientation="s" />
-        <terminal x="70" y="90" orientation="s" />
-        <terminal x="270" y="90" orientation="s" />
-        <terminal x="50" y="90" orientation="s" />
-    </description>
-</definition>

Deleted: branches/0.3/elements/blocs_de_securite/xps_asf.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/xps_asf.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/xps_asf.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,198 +0,0 @@
-<definition width="630" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
-    <names>
-        <name lang="en" >XPS-ASF</name>
-        <name lang="fr" >XPS-ASF</name>
-        <name lang="pl" >XPS-ASF</name>
-        <name lang="cs" >XPS-ASF</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="380" y2="-10" x2="380" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="64" x1="280" y2="41" x2="280" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="12" y2="40" x2="27" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36" x1="24" y2="44" x2="24" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="270" y2="0" x2="270" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="230" y2="0" x2="230" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="270" y2="41" x2="270" />
-        <text x="302" y="83.3333" size="7" text="S34" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="300" y2="90" x2="300" />
-        <text x="425" y="83.3333" size="7" text="24" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="420" y2="90" x2="420" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="440" y2="90" x2="440" />
-        <text x="434" y="63.3333" size="5" text="Sicherung" />
-        <text x="434" y="56.3333" size="5" text="Power OK" />
-        <text x="434" y="49.3333" size="5" text="Fusible" />
-        <text x="440" y="37.3333" size="5" text="A1/A2" />
-        <text x="470" y="37.3333" size="5" text="K1/K2" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31" x1="492" y2="31" x2="482" />
-        <polygon x4="470" antialias="false" style="line-style:normal;line-weight:thin;filling:black;color:black" y1="21" x1="470" y2="23" x2="465" y3="26" x3="468" y4="21" />
-        <text x="455" y="83.3333" size="7" text="T33/43" />
-        <text x="512" y="83.3333" size="7" text="Y44" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="530" y2="90" x2="530" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="510" y2="90" x2="510" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="520" y2="70" x2="520" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="500" y2="5" x2="520" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="56" x1="500" y2="56" x2="470" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="470" y2="70" x2="470" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="500" y2="56" x2="500" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="450" y2="70" x2="450" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="490" y2="70" x2="490" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="480" y2="-30" x2="480" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="460" y2="-30" x2="460" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="440" y2="-30" x2="440" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="420" y2="-30" x2="420" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="400" y2="-30" x2="400" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="360" y2="-30" x2="360" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="340" y2="-30" x2="340" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="320" y2="-30" x2="320" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="300" y2="-30" x2="300" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="90" y2="90" x2="90" />
-        <text x="-5" y="83.3333" size="7" text="PE" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-10" y2="90" x2="-10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="10" y2="90" x2="10" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="350" y2="26" x2="350" y3="3" x3="356" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="190" y2="70" x2="190" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36" x1="350" y2="36" x2="357" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="80" y2="-30" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="60" y2="-30" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="110" y2="70" x2="110" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="40" y2="-30" x2="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="230" y2="50" x2="230" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="230" y2="65" x2="270" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="50" y2="-10" x2="50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="280" y2="-30" x2="280" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="0" y2="40" x2="0" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="100" y2="-30" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="350" y2="5" x2="357" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="64" x1="350" y2="64" x2="280" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="70" y2="5" x2="50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="230" y2="65" x2="230" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="30" y2="40" x2="49" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="20" y2="20" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="200" y2="65" x2="215" />
-        <polygon x4="24" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="24" y2="36" x2="16" y3="44" x3="16" y4="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="100" y2="41" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="200" y2="41" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="180" y2="41" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="140" y2="41" x2="140" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="190" y2="0" x2="190" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="200" y2="65" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="215" y2="41" x2="215" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65" x1="60" y2="65" x2="0" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="60" y2="65" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36" x1="70" y2="36" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="60" y2="-5" x2="140" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-8" y2="20" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="380" y2="90" x2="380" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="400" y2="90" x2="400" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="320" y2="90" x2="320" />
-        <text x="385" y="83.3333" size="7" text="14" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="40" x2="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-43" y2="60" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="140" y2="-10" x2="140" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="20" y2="60" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="31" x1="462" y2="31" x2="452" />
-        <polygon x4="500" antialias="false" style="line-style:normal;line-weight:thin;filling:black;color:black" y1="21" x1="500" y2="23" x2="495" y3="26" x3="498" y4="21" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="27" x1="492" y2="35" x2="492" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="29" x1="492" y2="21" x2="500" y3="5" x3="500" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="27" x1="462" y2="35" x2="462" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="470" y2="33" x2="462" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="29" x1="462" y2="21" x2="470" y3="-10" x3="470" />
-        <text x="462" y="-17.6667" size="7" text="Y34" />
-        <text x="425" y="-17.6667" size="7" text="23" />
-        <text x="385" y="-17.6667" size="7" text="13" />
-        <text x="305" y="-17.6667" size="7" text="Y1" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="350" y2="-10" x2="350" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="64" x1="350" y2="57" x2="350" y3="34" x3="356" />
-        <text x="344" y="-17.6667" size="7" text="Y2" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="41" x1="500" y2="33" x2="492" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="30" y2="90" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="70" y2="90" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-50" y2="60" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-43" y2="20" x2="-43" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="27" y2="30" x2="31" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-43" y2="20" x2="-33" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="10" y2="30" x2="14" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28" x1="29" y2="32" x2="29" />
-        <rect width="220" x="70" y="0" antialias="false" height="41" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="14" x1="353" y2="14" x2="427" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="160" y2="-10" x2="160" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="120" y2="-10" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-50" y2="-10" x2="-50" />
-        <polygon x4="30" y5="50" x5="20" y6="40" x6="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="40" x1="10" y2="40" x2="10" y3="30" x3="20" y4="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="150" y2="70" x2="150" />
-        <arc width="5" x="-52.25" y="55" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="130" y2="70" x2="130" />
-        <arc width="5" x="-45.25" y="50" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <arc width="5" x="-45.25" y="40" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <arc width="5" x="-45.25" y="45" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <arc width="5" x="-52.25" y="40" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <arc width="5" x="-52.25" y="50" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <arc width="5" x="-52.25" y="45" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <text x="222" y="-16.6667" size="7" text="S32" />
-        <text x="340" y="45.3333" size="4" text="K2" />
-        <text x="340" y="15.3333" size="4" text="K1" />
-        <arc width="5" x="-45.25" y="55" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="44" x1="353" y2="44" x2="427" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="430" y2="-10" x2="430" />
-        <text x="36" y="83.3333" size="7" text="S33/41" />
-        <text x="-23" y="33.3333" size="7" text="T" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="28" x1="-33" y2="28" x2="-28" y3="12" x3="-8" />
-        <rect width="20" x="190" y="50" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="20" x="220" y="50" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="174" y="83.3333" size="7" text="Y4" />
-        <rect width="610" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="82" y="-17.6667" size="7" text="S12" />
-        <text x="134" y="83.3333" size="7" text="Y3" />
-        <text x="182" y="-17.6667" size="7" text="S22" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="430" y2="26" x2="430" y3="6" x3="425" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="430" y2="55" x2="430" y3="35" x3="425" />
-        <text x="265" y="-17.6667" size="7" text="B1" />
-        <text x="126" y="-17.6667" size="7" text="S21/31" />
-        <text x="-38" y="7.66667" size="9" text="XPS ASF" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="260" y2="-11" x2="260" />
-        <rect width="25" x="-33" y="15" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="390" y2="-10" x2="390" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="550" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="550" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="390" y2="26" x2="390" y3="6" x3="385" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="390" y2="55" x2="390" y3="35" x3="385" />
-        <text x="92" y="83.3333" size="7" text="S42" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-40" y2="-11" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
-        <text x="74" y="22" size="6" text="Logic" />
-        <text x="43" y="-17.6667" size="7" text="S11" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="240" y2="-29" x2="240" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="180" y2="-29" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="200" y2="-29" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="220" y2="-30" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="71" x1="170" y2="91" x2="170" />
-        <text x="-56" y="83.3333" size="7" text="A2" />
-        <text x="-56" y="-17.6667" size="7" text="A1" />
-        <text x="192" y="65.3333" size="4" text="K1" />
-        <text x="222" y="65.3333" size="4" text="K2" />
-        <terminal x="310" y="90" orientation="s" />
-        <terminal x="390" y="90" orientation="s" />
-        <terminal x="140" y="-30" orientation="n" />
-        <terminal x="140" y="90" orientation="s" />
-        <terminal x="-50" y="-30" orientation="n" />
-        <terminal x="-50" y="90" orientation="s" />
-        <terminal x="100" y="90" orientation="s" />
-        <terminal x="180" y="90" orientation="s" />
-        <terminal x="190" y="-30" orientation="n" />
-        <terminal x="230" y="-30" orientation="n" />
-        <terminal x="270" y="-30" orientation="n" />
-        <terminal x="90" y="-30" orientation="n" />
-        <terminal x="50" y="-30" orientation="n" />
-        <terminal x="50" y="90" orientation="s" />
-        <terminal x="0" y="90" orientation="s" />
-        <terminal x="470" y="-30" orientation="n" />
-        <terminal x="430" y="-30" orientation="n" />
-        <terminal x="390" y="-30" orientation="n" />
-        <terminal x="350" y="-30" orientation="n" />
-        <terminal x="310" y="-30" orientation="n" />
-        <terminal x="470" y="90" orientation="s" />
-        <terminal x="520" y="90" orientation="s" />
-        <terminal x="430" y="90" orientation="s" />
-    </description>
-</definition>

Deleted: branches/0.3/elements/blocs_de_securite/xps_ba.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/xps_ba.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/xps_ba.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,86 +0,0 @@
-<definition width="290" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
-    <names>
-        <name lang="en" >XPS-BA</name>
-        <name lang="fr" >XPS-BA</name>
-        <name lang="pl" >XPS-BA</name>
-        <name lang="cs" >XPS-BA</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="30" x1="150" y2="30" x2="188" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="140" y2="20" x2="140" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="140" y2="40" x2="140" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="120" y2="-30" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="30" y2="30" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="-10" x2="-10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="0" x2="-10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="180" y2="-30" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="140" y2="20" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="140" y2="40" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="200" y2="-30" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="15" y2="30" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-50" y2="50" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="26" x1="-26" y2="34" x2="-26" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-37" y2="30" x2="-23" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="20" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-50" y2="60" x2="-30" />
-        <polygon x4="-26" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="30" x1="-26" y2="26" x2="-34" y3="34" x3="-34" y4="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-50" y2="0" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="80" y2="-30" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-20" y2="-30" x2="-20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-10" x2="0" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="40" y2="-10" x2="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="200" y2="40" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-50" y2="60" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="180" y2="40" x2="188" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="180" y2="70" x2="180" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="190" y2="21" x2="190" y3="42" x3="186" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-50" y2="50" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-10" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="60" y2="-30" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-50" y2="0" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="-30" y2="40" x2="-30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-40" y2="30" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="100" y2="-30" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-20" y2="30" x2="-10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-40" y2="-30" x2="-40" />
-        <text x="23" y="-16.6667" size="7" text="T11" />
-        <text x="-17" y="-16.6667" size="7" text="T11" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-24" y2="20" x2="-20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-40" y2="20" x2="-36" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="-22" y2="22" x2="-22" />
-        <rect width="60" x="60" y="0" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <polygon x4="-20" y5="40" x5="-30" y6="30" x6="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="30" x1="-40" y2="30" x2="-40" y3="20" x3="-30" y4="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="170" y2="70" x2="170" />
-        <text x="145" y="22.3333" size="4" text="K1" />
-        <text x="195" y="82.3333" size="7" text="14" />
-        <text x="0" y="43.3333" size="7" text="T" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="38" x1="-10" y2="38" x2="-5" y3="22" x3="15" />
-        <rect width="20" x="130" y="25" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="174" y="82.3333" size="7" text="12" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="70" y2="0" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="110" y2="0" x2="110" />
-        <rect width="270" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="103" y="-16.6667" size="7" text="T13" />
-        <text x="185" y="-16.6667" size="7" text="23" />
-        <text x="-12" y="62.6667" size="9" text="XPS BA" />
-        <rect width="25" x="-10" y="25" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-60" y2="70" x2="210" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="210" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
-        <text x="64" y="32" size="6" text="Logic" />
-        <text x="63" y="-16.6667" size="7" text="T12" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="190" y2="90" x2="190" />
-        <text x="-56" y="82.3333" size="7" text="A2" />
-        <text x="-56" y="-16.6667" size="7" text="A1" />
-        <terminal x="-10" y="-30" orientation="n" />
-        <terminal x="30" y="-30" orientation="n" />
-        <terminal x="-50" y="-30" orientation="n" />
-        <terminal x="-50" y="90" orientation="s" />
-        <terminal x="180" y="90" orientation="s" />
-        <terminal x="190" y="-30" orientation="n" />
-        <terminal x="200" y="90" orientation="s" />
-        <terminal x="110" y="-30" orientation="n" />
-        <terminal x="70" y="-30" orientation="n" />
-    </description>
-</definition>

Deleted: branches/0.3/elements/blocs_de_securite/xps_bc.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/xps_bc.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/xps_bc.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,149 +0,0 @@
-<definition width="410" version="0.22" hotspot_x="90" hotspot_y="70" height="170" type="element" ic="true" orientation="dyyy" >
-    <names>
-        <name lang="en" >XPS-BC</name>
-        <name lang="fr" >XPS-BC</name>
-        <name lang="pl" >XPS-BC</name>
-        <name lang="cs" >XPS-BC</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="210" y2="90" x2="210" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-56" y2="50" x2="50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-40" y2="32" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-63" y2="37" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="-40" y2="12" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="-63" y2="7" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="-56" y2="50" x2="-56" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="200" y2="-40" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="290" y2="-40" x2="290" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="120" y2="-40" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="60" y2="-40" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="270" y2="-40" x2="270" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="46" x1="70" y2="70" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="240" y2="-40" x2="240" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="40" y2="-40" x2="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="250" y2="-40" x2="250" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="280" y2="40" x2="280" y3="18" x3="286" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="100" y2="-40" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="80" y2="-40" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="230" y2="-40" x2="230" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="200" y2="40" x2="200" y3="19" x3="195" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="-50" y2="22" x2="-56" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="280" y2="20" x2="280" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="290" y2="90" x2="290" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="52" x1="93" y2="46" x2="93" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="120" y2="90" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="20" y2="-40" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="46" x1="110" y2="66" x2="110" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="50" y2="70" x2="50" />
-        <rect width="100" x="60" y="30" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="-33" y2="22" x2="-47" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="280" y2="20" x2="287" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-70" y2="70" x2="-70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="60" y2="90" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="66" x1="134" y2="66" x2="150" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="66" x1="134" y2="61" x2="134" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="70" y2="-40" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="66" x1="150" y2="46" x2="150" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="66" x1="93" y2="66" x2="110" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="62" x1="93" y2="66" x2="93" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="51" x1="134" y2="46" x2="134" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="-60" y2="-40" x2="-60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="210" y2="-40" x2="210" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="30" y2="70" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="100" y2="90" x2="100" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="270" y2="90" x2="270" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="240" y2="40" x2="240" y3="20" x3="236" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="10" y2="22" x2="30" />
-        <polygon x4="-36" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="22" x1="-36" y2="18" x2="-44" y3="25" x3="-44" y4="22" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" x1="-30" y2="22" x2="-15" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="-36" y2="26" x2="-36" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="-70" y2="-40" x2="-70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="230" y2="90" x2="230" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="80" y2="90" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="160" y2="-40" x2="160" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="110" y2="30" x2="110" />
-        <text x="22" y="83.3333" size="7" text="T22" />
-        <text x="42" y="83.3333" size="7" text="T23" />
-        <text x="185" y="2.66667" size="4" text="K1" />
-        <text x="185" y="31.6667" size="4" text="K2" />
-        <arc width="5" x="-72.25" y="32" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <text x="42" y="-47.6667" size="7" text="T12" />
-        <arc width="5" x="-65.25" y="7" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <arc width="5" x="-72.25" y="7" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <arc width="5" x="-65.25" y="32" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <text x="22" y="-47.6667" size="7" text="T13" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="30" x1="150" y2="20" x2="150" y3="-2" x3="156" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="157" y2="0" x2="150" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="150" y2="-10" x2="150" y3="-32" x3="156" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="150" y2="-30" x2="157" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="20" y2="90" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="40" y2="90" x2="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="-50" y2="12" x2="-46" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="-35" y2="12" x2="-31" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-33" y2="14" x2="-33" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="1" x1="198" y2="1" x2="237" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="140" y2="-40" x2="140" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="190" y2="-40" x2="190" />
-        <polygon x4="-30" y5="32" x5="-40" y6="22" x6="-50" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="22" x1="-50" y2="22" x2="-50" y3="12" x3="-40" y4="22" />
-        <arc width="5" x="-72.25" y="27" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="190" y2="70" x2="190" />
-        <arc width="5" x="-65.25" y="22" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <arc width="5" x="-65.25" y="12" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <arc width="5" x="-65.25" y="17" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <arc width="5" x="-72.25" y="12" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <arc width="5" x="-72.25" y="22" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <arc width="5" x="-72.25" y="17" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="90" angle="-180" />
-        <text x="234" y="-47.6667" size="7" text="23" />
-        <text x="141" y="9.66667" size="4" text="K2" />
-        <text x="141" y="-20.3333" size="4" text="K1" />
-        <text x="274" y="83.3333" size="7" text="32" />
-        <arc width="5" x="-65.25" y="27" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black" start="-90" angle="-180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="30" x1="198" y2="30" x2="282.5" />
-        <text x="63" y="83.3333" size="7" text="T21" />
-        <text x="-4" y="35.3333" size="7" text="T" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="30" x1="-15" y2="30" x2="-10" y3="14" x3="10" />
-        <rect width="20" x="83" y="52" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="20" x="124" y="51" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="234" y="83.3333" size="7" text="24" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="150" y2="-30" x2="150" />
-        <rect width="390" x="-80" y="-60" antialias="false" height="150" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="105" y="-47.6667" size="7" text="Y1" />
-        <text x="195" y="83.3333" size="7" text="14" />
-        <text x="144" y="-47.6667" size="7" text="Y2" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="240" y2="10" x2="240" y3="-10" x3="235" />
-        <text x="275" y="-47.6667" size="7" text="31" />
-        <text x="195" y="-47.6667" size="7" text="13" />
-        <text x="-38" y="-14.3333" size="9" text="XPS BC" />
-        <rect width="25" x="-15" y="17" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-80" y2="70" x2="310" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="-80" y2="-40" x2="310" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="200" y2="10" x2="200" y3="-10" x3="195" />
-        <text x="101" y="83.3333" size="7" text="S22" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-60" y2="90" x2="-60" />
-        <text x="64" y="40" size="6" text="Logic" />
-        <text x="63" y="-47.6667" size="7" text="T11" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="250" y2="90" x2="250" />
-        <text x="-75" y="83.3333" size="7" text="A2" />
-        <text x="-76" y="-47.6667" size="7" text="A1" />
-        <text x="84" y="67.6667" size="4" text="K1" />
-        <text x="125" y="66.6667" size="4" text="K2" />
-        <terminal x="30" y="90" orientation="s" />
-        <terminal x="50" y="90" orientation="s" />
-        <terminal x="30" y="-60" orientation="n" />
-        <terminal x="50" y="-60" orientation="n" />
-        <terminal x="200" y="-60" orientation="n" />
-        <terminal x="200" y="90" orientation="s" />
-        <terminal x="-70" y="-60" orientation="n" />
-        <terminal x="-70" y="90" orientation="s" />
-        <terminal x="110" y="90" orientation="s" />
-        <terminal x="240" y="90" orientation="s" />
-        <terminal x="150" y="-60" orientation="n" />
-        <terminal x="240" y="-60" orientation="n" />
-        <terminal x="280" y="90" orientation="s" />
-        <terminal x="110" y="-60" orientation="n" />
-        <terminal x="70" y="-60" orientation="n" />
-        <terminal x="70" y="90" orientation="s" />
-        <terminal x="280" y="-60" orientation="n" />
-    </description>
-</definition>

Deleted: branches/0.3/elements/blocs_de_securite/xps_bf.elmt
===================================================================
--- branches/0.3/elements/blocs_de_securite/xps_bf.elmt	2010-06-17 12:29:15 UTC (rev 1060)
+++ branches/0.3/elements/blocs_de_securite/xps_bf.elmt	2010-06-19 10:32:03 UTC (rev 1061)
@@ -1,114 +0,0 @@
-<definition width="360" version="0.22" hotspot_x="70" hotspot_y="40" height="140" type="element" ic="true" orientation="dyyy" >
-    <names>
-        <name lang="en" >XPS-BF</name>
-        <name lang="fr" >XPS-BF</name>
-        <name lang="pl" >XPS-BF</name>
-        <name lang="cs" >XPS-BF</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="45" x1="210" y2="45" x2="267" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="15" x1="210" y2="15" x2="267" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="160" y2="0" x2="160" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="170" y2="-9.99997" x2="170" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="150" y2="-9.99997" x2="150" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="240" y2="90" x2="240" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="260" y2="-9.99997" x2="260" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="70" y2="60" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="240" y2="-9.99997" x2="240" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="260" y2="90" x2="260" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="130" y2="-9.99997" x2="130" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="220" y2="90" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="110" y2="-9.99997" x2="110" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="-10" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="-40" y2="20" x2="-20" />
-        <rect width="170" x="10" y="0" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="40" y2="-10" x2="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-20" y2="25" x2="10" />
-        <text x="-39" y="24.3333" size="4" text="DC" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="200" y2="25" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="-50" y2="35" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="50" y2="0" x2="50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="70" y2="0" x2="70" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="120" y2="0" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="200" y2="55" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-50" y2="25" x2="-50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="60" y2="-10" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="60" y2="70" x2="60" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="-20" y2="35" x2="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="-50" y2="70" x2="-50" />
-        <rect width="20" x="-40" y="20" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="50" y2="60" x2="50" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="30" y2="60" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="30" y2="0" x2="30" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="120" y2="70" x2="120" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="160" y2="70" x2="160" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-50" y2="15" x2="10" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-50" y2="25" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5.00003" x1="200" y2="5.00003" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="200" y2="25" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="170" y2="90" x2="170" />
-        <text x="-29" y="38.3333" size="4" text="DC" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="200" y2="35" x2="180" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5.00003" x1="200" y2="10" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="200" y2="40" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="200" y2="55" x2="200" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="150" y2="90" x2="150" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="80" y2="-10" x2="80" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="130" y2="90" x2="130" />
-        <text x="62" y="-16.6667" size="7" text="S13" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="110" y2="90" x2="110" />
-        <text x="154" y="82.3333" size="7" text="Y2" />
-        <text x="114" y="82.3333" size="7" text="Y1" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="20" y2="90" x2="20" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="40" y2="90" x2="40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="220" y2="-9.99997" x2="220" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="90" x1="80" y2="70" x2="80" />
-        <text x="23" y="-16.6667" size="7" text="S11" />
-        <text x="224" y="83.3333" size="7" text="14" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="230" y2="-10" x2="230" />
-        <text x="22" y="82.3333" size="7" text="S21" />
-        <rect width="20" x="190" y="40" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="20" x="190" y="10" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <rect width="340" x="-60" y="-30" antialias="false" height="120" style="line-style:normal;line-weight:normal;filling:none;color:black" />
-        <text x="154" y="-16.6667" size="7" text="Y2" />
-        <text x="61" y="83.3333" size="7" text="S23" />
-        <text x="265" y="-17.6667" size="7" text="23" />
-        <text x="265" y="83.3333" size="7" text="24" />
-        <text x="42" y="-16.6667" size="7" text="S12" />
-        <text x="225" y="-17.6667" size="7" text="13" />
-        <text x="-38" y="6.66667" size="9" text="XPS BF" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="270" y2="-10" x2="270" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-59" y2="70" x2="280" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-60" y2="-10" x2="280" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="230" y2="26" x2="230" y3="6" x3="225" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="36" x1="270" y2="26" x2="270" y3="6" x3="265" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="230" y2="55" x2="230" y3="35" x3="225" />
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="70" x1="270" y2="55" x2="270" y3="35" x3="265" />
-        <text x="42" y="83.3333" size="7" text="S22" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-40" y2="-11" x2="-40" />
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="-40" y2="90" x2="-40" />
-        <text x="14" y="31" size="6" text="Logic" />
-        <text x="114" y="-16.6667" size="7" text="Y1" />
-        <text x="-56" y="82.3333" size="7" text="A2" />
-        <text x="-56" y="-16.6667" size="7" text="A1" />
-        <text x="205" y="7.33336" size="4" text="K1" />
-        <text x="205" y="37.3333" size="4" text="K2" />
-        <terminal x="70" y="-30" orientation="n" />
-        <terminal x="120" y="90" orientation="s" />
-        <terminal x="160" y="90" orientation="s" />
-        <terminal x="230" y="-30" orientation="n" />
-        <terminal x="70" y="90" orientation="s" />
-        <terminal x="-50" y="-30" orientation="n" />
-        <terminal x="-50" y="90" orientation="s" />
-        <terminal x="50" y="90" orientation="s" />
-        <terminal x="270" y="-30" orientation="n" />
-        <terminal x="30" y="-30" orientation="n" />
-        <terminal x="50" y="-30" orientation="n" />
-        <terminal x="230" y="90" orientation="s" />
-        <terminal x="160" y="-30" orientation="n" />
-        <terminal x="120" y="-30" orientation="n" />
-        <terminal x="270" y="90" orientation="s" />
-        <terminal x="30" y="90" orientation="s" />
-    </description>
-</definition>

Messages sorted by: [ date | thread ]
Prev by Date: [qet] Soumission d'element sur le depot
Next by Date: [qet] Soumission d'element sur le depot
Previous by thread: [qet] [1060] correct the error in the name of the element
Next by thread: [qet] [1062] Add new symbols plc siemens: pawel ;-)

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/