From: Andre Noll Date: Wed, 30 Oct 2019 09:58:12 +0000 (+0100) Subject: Merge branch 'refs/heads/t/svg-logo' X-Git-Tag: v1.0.1~2 X-Git-Url: http://git.tuebingen.mpg.de/dss.git/log?a=commitdiff_plain;h=a49a95efca7e3b22c1b06b38319fdfbeea8c7fe2;hp=0f8170444cf9e2bcc42b64bdcae3a38b7ac55e66;p=dss.git Merge branch 'refs/heads/t/svg-logo' Cooking for about a month. The web page has been updated today to use the new logo. * refs/heads/t/svg-logo: Redo the logo as svg. --- diff --git a/.gitignore b/.gitignore index 1bb2a25..4aafb48 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,4 @@ dss.lsg.* dss dss.1 dss.1.html -dss.png index.html diff --git a/Makefile b/Makefile index 2d0a6bb..ef00f50 100644 --- a/Makefile +++ b/Makefile @@ -38,9 +38,6 @@ dss: $(dss_objects) %.o: %.c Makefile $(CC) -c $(DSS_CPPFLAGS) $(CPPFLAGS) $(DSS_CFLAGS) $(CFLAGS) $< -dss.png: mklogo - ./mklogo > $@ - %.lsg.h: %.suite lopsubgen --gen-h=$@ < $< %.lsg.c: %.suite @@ -52,7 +49,7 @@ dss.png: mklogo groff -m man -Thtml -P -l -P -r $< | sed -e '1,/^/d; /^<\/body>/,$$d' > $@ clean: - rm -f *.o dss dss.1 dss.1.html Makefile.deps *.png *~ index.html dss.lsg.h dss.lsg.c + rm -f *.o dss dss.1 dss.1.html Makefile.deps *~ index.html dss.lsg.h dss.lsg.c ifneq ($(findstring strip, $(MAKECMDGOALS)),) strip_option := -s diff --git a/dss.svg b/dss.svg new file mode 100644 index 0000000..fb69bd7 --- /dev/null +++ b/dss.svg @@ -0,0 +1,65 @@ + diff --git a/index.html.in b/index.html.in index 42606ca..b505761 100644 --- a/index.html.in +++ b/index.html.in @@ -12,7 +12,7 @@

The dyadic snapshot scheduler

diff --git a/mklogo b/mklogo deleted file mode 100755 index d4705ba..0000000 --- a/mklogo +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# SPDX-License-Identifier: GPL-2.0 - -# Script for Image Magick that writes the dss logo in png format -# to stdout. - -set -u - -width=320 -height=110 -border=5 -radius1=4 -radius2=5 -circle_y=90 -arrow_y=70 -text_x=128 -text_y=55 -pointsize=36 - -declare -a circle arrow rectangle text - -make_circles() -{ - local inner='stroke black fill red circle' - local outer='stroke black fill black circle' - local num=1 - local idx=0 - local y=$circle_y - local step x0 i j idx num - - for ((i = 0; i < 4; i++)); do - step=$(((width / 4 + num) / (num + 1))) - x0=$((border + width / 4 * i)) - for ((j = 1; j <= $num; j++)); do - x=$((x0 + j * $step)) - circle[$idx]='-draw'; let idx++ - circle[$idx]="$outer $x,$y,$((x + radius2)),$y"; let idx++ - circle[$idx]='-draw'; let idx++ - circle[$idx]="$inner $x,$y,$((x + radius1)),$y"; let idx++ - done - num=$((num * 2)) - done - #echo "${circle[@]}"; exit 0 -} - -make_arrow() -{ - local arrow_head='l -15,-5 +5,+5 -5,+5 +15,-5 z' - local idx=0 - local x0 x1 y - - arrow[$idx]='-draw'; let idx++ - x0=$((3 * border)); x1=$((width - 2 * border)) - y=$arrow_y - arrow[$idx]="stroke white line $x0,$y $x1,$y"; let idx++ - arrow[$idx]='-draw'; let idx++ - x0=$((width - 2 * border)) - arrow[$idx]="stroke white fill white path 'M $x0,$y $arrow_head'" - #echo "${arrow[@]}"; exit 0 -} - -make_rectangles() -{ - local idx=0 - local x x0 x1 y y0 y1 i red_green color - - rectangle[$idx]='-draw'; let idx++ - x=$((width + 2 * border)) - y=$((height + 2 * border)) - rectangle[$idx]="stroke yellow fill yellow rectangle 0,0 $x,$y"; let idx++ - for ((i = 0; i < 4; i++)); do - rectangle[$idx]='-draw'; let idx++ - red_green="$(printf '%02x' $(((3 - i) * 60)))" - color="#${red_green}${red_green}ff" - x0=$((border + i * width / 4)); x1=$((x0 + width / 4 - 1)) - y0=$border; y1=$((y0 + height)) - rectangle[$idx]="stroke $color fill $color rectangle $x0,$y0 $x1,$y1" - let idx++ - done - #echo "${rectangle[@]}"; exit 0 -} - -make_text() -{ - text=(-pointsize $pointsize -draw \ - "fill white text $text_x,$text_y DSS") - #echo "${text[@]}"; exit 0 -} - -make_rectangles -make_arrow -make_circles -make_text - -convert -size $((width + 2 * border))x$((height + 2 * border)) \ - -background none xc: \ - "${rectangle[@]}" \ - "${arrow[@]}" \ - "${circle[@]}" \ - "${text[@]}" \ - png:-