Merge branch 't/dia'
authorAndre Noll <maan@systemlinux.org>
Wed, 16 Oct 2013 12:35:46 +0000 (14:35 +0200)
committerAndre Noll <maan@systemlinux.org>
Wed, 16 Oct 2013 12:38:28 +0000 (14:38 +0200)
The single commit of this branch is more than one year old. I totally
forgot about it, but here it is:

311ec5 Switch logo from skencil to dia.

The web page has been updated to contain the new image.

Makefile
dss.dia [new file with mode: 0644]
dss.sk [deleted file]

index bbe616a..821ccaf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,10 +30,8 @@ cmdline.o: cmdline.c cmdline.h
 %.o: %.c Makefile
        $(CC) -c $(CFLAGS) $(DEBUG_CFLAGS) $<
 
-%.ppm: %.sk
-       sk2ppm $< > $@
-%.png: %.ppm
-       convert $< $@
+%.png: %.dia
+       dia -e $@ -t png $<
 
 cmdline.c cmdline.h: dss.ggo
        gengetopt --conf-parser < $<
@@ -45,7 +43,7 @@ dss.1: dss dss.1.inc
        man2html $< > $@
 
 clean:
-       rm -f *.o dss dss.1 dss.1.html Makefile.deps *.ppm *.png *~ cmdline.c cmdline.h index.html
+       rm -f *.o dss dss.1 dss.1.html Makefile.deps *.png *~ cmdline.c cmdline.h index.html
 
 index.html: dss.1.html index.html.in INSTALL README NEWS
        sed -e '/@README@/,$$d' index.html.in > $@
diff --git a/dss.dia b/dss.dia
new file mode 100644 (file)
index 0000000..a02f700
--- /dev/null
+++ b/dss.dia
@@ -0,0 +1,960 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/">
+  <dia:diagramdata>
+    <dia:attribute name="background">
+      <dia:color val="#ffffff"/>
+    </dia:attribute>
+    <dia:attribute name="pagebreak">
+      <dia:color val="#000099"/>
+    </dia:attribute>
+    <dia:attribute name="paper">
+      <dia:composite type="paper">
+        <dia:attribute name="name">
+          <dia:string>#A4#</dia:string>
+        </dia:attribute>
+        <dia:attribute name="tmargin">
+          <dia:real val="2.8222000598907471"/>
+        </dia:attribute>
+        <dia:attribute name="bmargin">
+          <dia:real val="2.8222000598907471"/>
+        </dia:attribute>
+        <dia:attribute name="lmargin">
+          <dia:real val="2.8222000598907471"/>
+        </dia:attribute>
+        <dia:attribute name="rmargin">
+          <dia:real val="2.8222000598907471"/>
+        </dia:attribute>
+        <dia:attribute name="is_portrait">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+        <dia:attribute name="scaling">
+          <dia:real val="1"/>
+        </dia:attribute>
+        <dia:attribute name="fitto">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+      </dia:composite>
+    </dia:attribute>
+    <dia:attribute name="grid">
+      <dia:composite type="grid">
+        <dia:attribute name="width_x">
+          <dia:real val="1"/>
+        </dia:attribute>
+        <dia:attribute name="width_y">
+          <dia:real val="1"/>
+        </dia:attribute>
+        <dia:attribute name="visible_x">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="visible_y">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:composite type="color"/>
+      </dia:composite>
+    </dia:attribute>
+    <dia:attribute name="color">
+      <dia:color val="#d8e5e5"/>
+    </dia:attribute>
+    <dia:attribute name="guides">
+      <dia:composite type="guides">
+        <dia:attribute name="hguides"/>
+        <dia:attribute name="vguides"/>
+      </dia:composite>
+    </dia:attribute>
+  </dia:diagramdata>
+  <dia:layer name="New layer 1" visible="true" active="true">
+    <dia:object type="Standard - Box" version="0" id="O0">
+      <dia:attribute name="obj_pos">
+        <dia:point val="13.1551,5.70485"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="13.1051,5.65485;29.4092,11.5949"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="13.1551,5.70485"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="16.204140120230058"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="5.8400708047529699"/>
+      </dia:attribute>
+      <dia:attribute name="border_width">
+        <dia:real val="0.10000000149011612"/>
+      </dia:attribute>
+      <dia:attribute name="border_color">
+        <dia:color val="#ffff00"/>
+      </dia:attribute>
+      <dia:attribute name="inner_color">
+        <dia:color val="#ffff00"/>
+      </dia:attribute>
+      <dia:attribute name="show_background">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:group>
+      <dia:object type="Standard - Box" version="0" id="O1">
+        <dia:attribute name="obj_pos">
+          <dia:point val="13.5072,6.07489"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="13.4572,6.02489;17.3572,11.2249"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="13.5072,6.07489"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="3.8000000000000007"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="5.0999999999999996"/>
+        </dia:attribute>
+        <dia:attribute name="border_width">
+          <dia:real val="0.10000000149011612"/>
+        </dia:attribute>
+        <dia:attribute name="border_color">
+          <dia:color val="#cbd4fa"/>
+        </dia:attribute>
+        <dia:attribute name="inner_color">
+          <dia:color val="#cbd4fa"/>
+        </dia:attribute>
+        <dia:attribute name="show_background">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Standard - Box" version="0" id="O2">
+        <dia:attribute name="obj_pos">
+          <dia:point val="17.4072,6.07489"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="17.3572,6.02489;21.2572,11.2249"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="17.4072,6.07489"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="3.8000000000000007"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="5.0999999999999996"/>
+        </dia:attribute>
+        <dia:attribute name="border_width">
+          <dia:real val="0.10000000149011612"/>
+        </dia:attribute>
+        <dia:attribute name="border_color">
+          <dia:color val="#90a5fe"/>
+        </dia:attribute>
+        <dia:attribute name="inner_color">
+          <dia:color val="#90a5fe"/>
+        </dia:attribute>
+        <dia:attribute name="show_background">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Standard - Box" version="0" id="O3">
+        <dia:attribute name="obj_pos">
+          <dia:point val="21.3072,6.07489"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="21.2572,6.02489;25.1572,11.2249"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="21.3072,6.07489"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="3.8000000000000007"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="5.0999999999999996"/>
+        </dia:attribute>
+        <dia:attribute name="border_width">
+          <dia:real val="0.10000000149011612"/>
+        </dia:attribute>
+        <dia:attribute name="border_color">
+          <dia:color val="#5e78f6"/>
+        </dia:attribute>
+        <dia:attribute name="inner_color">
+          <dia:color val="#5e78f6"/>
+        </dia:attribute>
+        <dia:attribute name="show_background">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Standard - Box" version="0" id="O4">
+        <dia:attribute name="obj_pos">
+          <dia:point val="25.2072,6.07489"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="25.1572,6.02489;29.0572,11.2249"/>
+        </dia:attribute>
+        <dia:attribute name="elem_corner">
+          <dia:point val="25.2072,6.07489"/>
+        </dia:attribute>
+        <dia:attribute name="elem_width">
+          <dia:real val="3.8000000000000007"/>
+        </dia:attribute>
+        <dia:attribute name="elem_height">
+          <dia:real val="5.0999999999999996"/>
+        </dia:attribute>
+        <dia:attribute name="border_width">
+          <dia:real val="0.10000000149011612"/>
+        </dia:attribute>
+        <dia:attribute name="border_color">
+          <dia:color val="#0000ff"/>
+        </dia:attribute>
+        <dia:attribute name="inner_color">
+          <dia:color val="#0910f4"/>
+        </dia:attribute>
+        <dia:attribute name="show_background">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:group>
+        <dia:group>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O5">
+            <dia:attribute name="obj_pos">
+              <dia:point val="25.3046,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="25.2546,9.69613;25.7177,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="25.3046,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O6">
+            <dia:attribute name="obj_pos">
+              <dia:point val="25.7677,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="25.7177,9.69613;26.1809,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="25.7677,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O7">
+            <dia:attribute name="obj_pos">
+              <dia:point val="26.2309,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="26.1809,9.69613;26.644,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="26.2309,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O8">
+            <dia:attribute name="obj_pos">
+              <dia:point val="26.694,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="26.644,9.69613;27.1072,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="26.694,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O9">
+            <dia:attribute name="obj_pos">
+              <dia:point val="27.1572,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="27.1072,9.69613;27.5703,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="27.1572,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O10">
+            <dia:attribute name="obj_pos">
+              <dia:point val="27.6203,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="27.5703,9.69613;28.0335,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="27.6203,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O11">
+            <dia:attribute name="obj_pos">
+              <dia:point val="28.0835,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="28.0335,9.69613;28.4966,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="28.0835,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O12">
+            <dia:attribute name="obj_pos">
+              <dia:point val="28.5466,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="28.4966,9.69613;28.9598,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="28.5466,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+        </dia:group>
+        <dia:group>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O13">
+            <dia:attribute name="obj_pos">
+              <dia:point val="21.8026,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="21.7526,9.69613;22.2157,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="21.8026,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O14">
+            <dia:attribute name="obj_pos">
+              <dia:point val="22.6179,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="22.5679,9.69613;23.0311,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="22.6179,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O15">
+            <dia:attribute name="obj_pos">
+              <dia:point val="23.4333,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="23.3833,9.69613;23.8464,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="23.4333,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O16">
+            <dia:attribute name="obj_pos">
+              <dia:point val="24.2486,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="24.1986,9.69613;24.6618,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="24.2486,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+        </dia:group>
+        <dia:object type="Geometric - Perfect Circle" version="1" id="O17">
+          <dia:attribute name="obj_pos">
+            <dia:point val="15.2256,9.74613"/>
+          </dia:attribute>
+          <dia:attribute name="obj_bb">
+            <dia:rectangle val="15.1756,9.69613;15.6388,10.1593"/>
+          </dia:attribute>
+          <dia:attribute name="meta">
+            <dia:composite type="dict"/>
+          </dia:attribute>
+          <dia:attribute name="elem_corner">
+            <dia:point val="15.2256,9.74613"/>
+          </dia:attribute>
+          <dia:attribute name="elem_width">
+            <dia:real val="0.3631490811886362"/>
+          </dia:attribute>
+          <dia:attribute name="elem_height">
+            <dia:real val="0.3631490811886362"/>
+          </dia:attribute>
+          <dia:attribute name="line_width">
+            <dia:real val="0.10000000149011612"/>
+          </dia:attribute>
+          <dia:attribute name="line_colour">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="fill_colour">
+            <dia:color val="#ff0000"/>
+          </dia:attribute>
+          <dia:attribute name="show_background">
+            <dia:boolean val="true"/>
+          </dia:attribute>
+          <dia:attribute name="line_style">
+            <dia:enum val="0"/>
+            <dia:real val="1"/>
+          </dia:attribute>
+          <dia:attribute name="flip_horizontal">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="flip_vertical">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="subscale">
+            <dia:real val="1"/>
+          </dia:attribute>
+        </dia:object>
+        <dia:group>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O18">
+            <dia:attribute name="obj_pos">
+              <dia:point val="18.3889,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="18.3389,9.69613;18.8021,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="18.3889,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.3631490811886362"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+          <dia:object type="Geometric - Perfect Circle" version="1" id="O19">
+            <dia:attribute name="obj_pos">
+              <dia:point val="19.8623,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="obj_bb">
+              <dia:rectangle val="19.8123,9.69613;20.2754,10.1593"/>
+            </dia:attribute>
+            <dia:attribute name="meta">
+              <dia:composite type="dict"/>
+            </dia:attribute>
+            <dia:attribute name="elem_corner">
+              <dia:point val="19.8623,9.74613"/>
+            </dia:attribute>
+            <dia:attribute name="elem_width">
+              <dia:real val="0.36314908118863798"/>
+            </dia:attribute>
+            <dia:attribute name="elem_height">
+              <dia:real val="0.36314908118863798"/>
+            </dia:attribute>
+            <dia:attribute name="line_width">
+              <dia:real val="0.10000000149011612"/>
+            </dia:attribute>
+            <dia:attribute name="line_colour">
+              <dia:color val="#000000"/>
+            </dia:attribute>
+            <dia:attribute name="fill_colour">
+              <dia:color val="#ff0000"/>
+            </dia:attribute>
+            <dia:attribute name="show_background">
+              <dia:boolean val="true"/>
+            </dia:attribute>
+            <dia:attribute name="line_style">
+              <dia:enum val="0"/>
+              <dia:real val="1"/>
+            </dia:attribute>
+            <dia:attribute name="flip_horizontal">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="flip_vertical">
+              <dia:boolean val="false"/>
+            </dia:attribute>
+            <dia:attribute name="subscale">
+              <dia:real val="1"/>
+            </dia:attribute>
+          </dia:object>
+        </dia:group>
+      </dia:group>
+      <dia:object type="Standard - Line" version="0" id="O20">
+        <dia:attribute name="obj_pos">
+          <dia:point val="14.4506,9.23568"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="14.4006,8.90478;28.1138,9.56659"/>
+        </dia:attribute>
+        <dia:attribute name="conn_endpoints">
+          <dia:point val="14.4506,9.23568"/>
+          <dia:point val="28.002,9.23568"/>
+        </dia:attribute>
+        <dia:attribute name="numcp">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="line_color">
+          <dia:color val="#ffffff"/>
+        </dia:attribute>
+        <dia:attribute name="line_width">
+          <dia:real val="0.10000000000000001"/>
+        </dia:attribute>
+        <dia:attribute name="end_arrow">
+          <dia:enum val="3"/>
+        </dia:attribute>
+        <dia:attribute name="end_arrow_length">
+          <dia:real val="0.5"/>
+        </dia:attribute>
+        <dia:attribute name="end_arrow_width">
+          <dia:real val="0.5"/>
+        </dia:attribute>
+      </dia:object>
+      <dia:object type="Standard - Text" version="1" id="O21">
+        <dia:attribute name="obj_pos">
+          <dia:point val="19.8922,8.37201"/>
+        </dia:attribute>
+        <dia:attribute name="obj_bb">
+          <dia:rectangle val="19.8922,6.86701;22.6222,8.68701"/>
+        </dia:attribute>
+        <dia:attribute name="text">
+          <dia:composite type="text">
+            <dia:attribute name="string">
+              <dia:string>#DSS#</dia:string>
+            </dia:attribute>
+            <dia:attribute name="font">
+              <dia:font family="Serif" style="80" name="Times-Bold"/>
+            </dia:attribute>
+            <dia:attribute name="height">
+              <dia:real val="1.8584333549302243"/>
+            </dia:attribute>
+            <dia:attribute name="pos">
+              <dia:point val="19.8922,8.37201"/>
+            </dia:attribute>
+            <dia:attribute name="color">
+              <dia:color val="#ffffff"/>
+            </dia:attribute>
+            <dia:attribute name="alignment">
+              <dia:enum val="0"/>
+            </dia:attribute>
+          </dia:composite>
+        </dia:attribute>
+        <dia:attribute name="valign">
+          <dia:enum val="3"/>
+        </dia:attribute>
+      </dia:object>
+    </dia:group>
+  </dia:layer>
+</dia:diagram>
diff --git a/dss.sk b/dss.sk
deleted file mode 100644 (file)
index 97d2531..0000000
--- a/dss.sk
+++ /dev/null
@@ -1,94 +0,0 @@
-##Sketch 1 2
-document()
-layout((362.835,119.055),0)
-layer('Layer 1',1,1,0,0,(0,0,0))
-G()
-fp((1,1,0))
-le()
-lw(1)
-r(365.344,0,0,-120.099,0.422729,119.405)
-G()
-fp((0.251,0.251,1))
-le()
-lw(1)
-r(87.8038,0,0,-106.979,183.131,112.845)
-fp((0,0,1))
-le()
-lw(1)
-r(87.8038,0,0,-106.979,271.005,112.845)
-fp((0.753,0.753,1))
-le()
-lw(1)
-r(87.8038,0,0,-106.979,7.38173,112.845)
-fp((0.502,0.502,1))
-le()
-lw(1)
-r(87.8038,0,0,-106.979,95.2567,112.845)
-G()
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,279.884,38.1606)
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,289.891,38.1606)
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,299.897,38.1606)
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,309.903,38.1606)
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,319.91,38.1606)
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,329.916,38.1606)
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,339.922,38.1606)
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,349.928,38.1606)
-G_()
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,51.2837,35.1326)
-G()
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,201.095,39.1696)
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,218.387,39.1696)
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,235.678,39.1696)
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,252.969,39.1696)
-G_()
-G()
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,124.56,37.1516)
-fp((1,0,0))
-lw(1)
-e(5.04619,0,0,-5.04619,153.757,37.1516)
-G_()
-fp((0.058,0.227,0.465))
-lp((1,1,1))
-lw(2.83465)
-la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
-b()
-bs(35.6407,57.3367,0)
-bs(335.841,57.3367,0)
-fp((1,1,1))
-le()
-lw(1)
-Fn('Times-Bold')
-Fs(36)
-txt('DSS',(154.731,69.4476))
-G_()
-G_()
-guidelayer('Guide Lines',1,0,0,1,(0,0,1))
-grid((0,0,20,20),0,(0,0,1),'Grid')