]> git.tue.mpg.de Git - dss.git/commitdiff
Redo the logo as svg.
authorAndre Noll <maan@tuebingen.mpg.de>
Sat, 19 Jan 2019 11:16:24 +0000 (12:16 +0100)
committerAndre Noll <maan@tuebingen.mpg.de>
Wed, 18 Sep 2019 08:34:04 +0000 (10:34 +0200)
Scalable vector graphics are much nicer for web pages than bitmaps. The
mklogo script can be removed and there is no more dependency on
ImageMagick. What a deal.

The new logo was made with vi. It is a bit smaller than the old logo
but looks similar.

.gitignore
Makefile
dss.svg [new file with mode: 0644]
index.html.in
mklogo [deleted file]

index 1bb2a256e58d29073cf553ece92b355f5bf2ef7b..4aafb488c3fc2f1196e67b58c20b7998684a5126 100644 (file)
@@ -5,5 +5,4 @@ dss.lsg.*
 dss
 dss.1
 dss.1.html
-dss.png
 index.html
index 2d0a6bb64e6a4094081b6efc9779fcfc1156a153..ef00f50cffdec1fdf36b24f8fa0f4b5f0adb8035 100644 (file)
--- 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,/^<body>/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 (file)
index 0000000..fb69bd7
--- /dev/null
+++ b/dss.svg
@@ -0,0 +1,65 @@
+<svg
+       xmlns="http://www.w3.org/2000/svg"
+       xmlns:xlink="http://www.w3.org/1999/xlink"
+       width="154"
+       height="100"
+>
+       <defs>
+               <rect id="rect"
+                       stroke-width="0"
+                       x="0"
+                       y="0"
+                       width="37"
+                       height="94"
+               />
+       </defs>
+       <defs>
+               <circle id="circle"
+                       stroke-width="1"
+                       stroke="black"
+                       fill="#a22"
+                       cx="0"
+                       cy="0"
+                       r="4"
+               />
+       </defs>
+       <marker
+               id="arrow"
+               stroke="white"
+               fill="white"
+               viewBox="0 0 10 10" refX="5" refY="5"
+               markerWidth="4" markerHeight="4"
+               orient="auto-start-reverse">
+               <path d="M 0 0 L 10 5 L 0 10 z" />
+       </marker>
+       <use fill="#bbf" xlink:href="#rect" transform="translate(0, 0)"/>
+       <use fill="#99f" xlink:href="#rect" transform="translate(36, 0)"/>
+       <use fill="#44f" xlink:href="#rect" transform="translate(72, 0)"/>
+       <use fill="#11f" xlink:href="#rect" transform="translate(108, 0)"/>
+
+       <text x="47" y="40" stroke="white" fill="white" font-size="25">DSS</text>
+
+       <line
+               x1="7" y1="50" x2="127" y2="50" stroke-width="3"
+               stroke="white"
+               marker-end="url(#arrow)"
+       />
+       <use xlink:href="#circle" x="18" y="77"/>
+
+       <use xlink:href="#circle" x="48" y="77"/>
+       <use xlink:href="#circle" x="60" y="77"/>
+
+       <use xlink:href="#circle" x="77" y="77"/>
+       <use xlink:href="#circle" x="86" y="77"/>
+       <use xlink:href="#circle" x="95" y="77"/>
+       <use xlink:href="#circle" x="104" y="77"/>
+
+       <use xlink:href="#circle" x="113" y="70"/>
+       <use xlink:href="#circle" x="122" y="70"/>
+       <use xlink:href="#circle" x="131" y="70"/>
+       <use xlink:href="#circle" x="140" y="70"/>
+       <use xlink:href="#circle" x="114" y="85"/>
+       <use xlink:href="#circle" x="122" y="85"/>
+       <use xlink:href="#circle" x="130" y="85"/>
+       <use xlink:href="#circle" x="138" y="85"/>
+</svg>
index 42606cabd91b2e80a41a3c959ac4b683a53f5753..b505761997987f74dfe6a9d2fe73046e21a0e868 100644 (file)
@@ -12,7 +12,7 @@
        <table>
                <tr>
                        <td>
-                               <IMG SRC="dss.png" alt="dss">
+                               <img src="dss.svg" alt="dss">
                        </td>
                        <td>
                                <h1>The dyadic snapshot scheduler</h1>
diff --git a/mklogo b/mklogo
deleted file mode 100755 (executable)
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:-