From: Andre Noll Date: Wed, 16 Oct 2013 12:35:46 +0000 (+0200) Subject: Merge branch 't/dia' X-Git-Tag: v0.1.5~2 X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=f33cf243ae1cb5657cccb7c43c99093936093b4a;hp=d880112b1483b45f1e7db632cb09bbe05fb2df86 Merge branch 't/dia' 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. --- diff --git a/Makefile b/Makefile index bbe616a..821ccaf 100644 --- 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 index 0000000..a02f700 --- /dev/null +++ b/dss.dia @@ -0,0 +1,960 @@ + + + + + + + + + + + + + #A4# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #DSS# + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dss.sk b/dss.sk deleted file mode 100644 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')