Merge pull request #17 from hyanwong/main

jeromekelleher · web-flow · commit 4e8f6586eb14 · 2023-03-02T10:42:39.000Z
Add code to generate a laptop sticker
diff --git a/sticker/Makefile b/sticker/Makefile
@@ -0,0 +1,20 @@
+# Note that for aesthetic purposes, the original tskit logo at ../tskit_logo.svg
+# was altered slightly for this makefile, to create a version where the root branch
+# is centred.
+
+all: tskit_logo_hexsticker.png
+
+tskit_logo.png: ../tskit_logo.svg
+	inkscape --export-type="png" -d 300 -o tskit_logo.png tskit_logo_root_centred.svg
+
+tskit_logo_square.png: tskit_logo.png
+	convert tskit_logo.png -background white -gravity center -resize 3000x3000 \
+	-extent 4000x3650 -gravity south -splice 0x350 tskit_logo_square.png
+
+# Two colours in logo: #045167 #12e3a8
+tskit_logo_hexsticker.png: tskit_logo_square.png
+	hexsticker -v --padding-size 25 --supersample 2 \
+		--border-size 640 --border-color '#045167' \
+		-o tskit_logo_hexsticker.png tskit_logo_square.png
+clean:
+	rm *.png
diff --git a/sticker/README.md b/sticker/README.md
@@ -0,0 +1,6 @@
+# Tskit laptop sticker
+
+The makefile in this directory creates a hexagonal laptop sticker continaing the tskit logo.
+
+Ensure that Imagemagick, inkscape, and the `hexsticker` python package are installed, then
+run `make`
diff --git a/sticker/requirements.txt b/sticker/requirements.txt
@@ -0,0 +1,2 @@
+# Note that imagemagick and inkscape are also required for the makefile to run
+hexsticker
diff --git a/sticker/tskit_logo_root_centred.svg b/sticker/tskit_logo_root_centred.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 1434.6667 1149.8267"
+   height="1149.8267"
+   width="1434.6667"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"
+   sodipodi:docname="tskit_logo.svg"
+   inkscape:version="1.2-alpha1 (b6a15bb, 2022-02-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
+     id="namedview154"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="0.20524833"
+     inkscape:cx="855.06177"
+     inkscape:cy="538.37223"
+     inkscape:window-width="1396"
+     inkscape:window-height="739"
+     inkscape:window-x="44"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g12" /><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6" /><g
+     transform="matrix(1.3333333,0,0,-1.3333333,0,1149.8267)"
+     id="g10"><g
+       transform="scale(0.1)"
+       id="g12"><path
+         id="path14"
+         style="fill:#204e66;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 254.164,839.941 V 1878.05 H 0 v 430.74 h 254.164 v 633.2 h 611.637 v -633.2 H 1499 V 1878.05 H 865.801 V 839.941 c 0,-236.91 99.094,-366.121 323.049,-366.121 142.17,0 258.47,47.371 310.15,77.532 V 103.371 C 1412.85,60.3008 1249.18,0 1012.27,0 478.121,0 254.164,353.191 254.164,839.941" /><path
+         id="path16"
+         style="fill:#204e66;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 2972.13,1399.92 c 568.61,-168 805.52,-344.6 805.52,-749.49 C 3777.65,232.59 3454.6,0 2963.53,0 2627.57,0 2416.47,90.4414 2274.35,236.91 l -8.6,-167.9998 H 1835 V 848.57 h 473.82 c 94.74,-236.91 284.28,-391.98 568.56,-391.98 159.38,0 288.59,64.601 288.59,198.14 0,133.532 -124.91,189.512 -215.35,215.372 l -336,90.449 c -353.22,94.769 -792.57,211.069 -792.57,758.119 0,426.43 305.84,654.73 758.14,654.73 223.96,0 460.87,-64.61 637.5,-223.98 l 8.61,159.37 h 430.74 v -753.82 h -473.82 c -73.23,245.54 -258.46,366.15 -460.91,366.15 -159.37,0 -288.58,-68.91 -288.58,-211.08 0,-120.6 77.53,-172.28 232.6,-219.67 l 305.8,-90.45" /><path
+         id="path18"
+         style="fill:#204e66;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 5022.48,68.9102 V 499.66 H 5268 v 2369.1 h -245.52 v 430.75 h 857.2 V 1473.14 h 512.59 l 219.69,404.91 h -323.09 v 430.74 h 1219.02 v -430.74 h -331.66 l -361.82,-611.66 538.41,-766.73 h 353.21 V 68.9102 H 6456.89 V 499.66 h 219.66 l -361.82,585.82 H 5879.68 V 499.66 h 245.51 V 68.9102 H 5022.48" /><path
+         id="path20"
+         style="fill:#204e66;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 8085.1,3015.22 c 0,198.14 137.82,348.89 366.12,348.89 228.31,0 366.13,-150.75 366.13,-348.89 0,-198.14 -137.82,-348.91 -366.13,-348.91 -228.3,0 -366.12,150.77 -366.12,348.91 z M 7951.54,68.9102 V 499.66 h 245.52 v 1378.39 h -245.52 v 430.74 h 857.2 V 499.66 h 245.52 V 68.9102 H 7951.54" /><path
+         id="path22"
+         style="fill:#204e66;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 9515.17,839.941 V 1878.05 H 9261 v 430.74 h 254.17 v 633.2 h 611.63 v -633.2 h 633.2 v -430.74 h -633.2 V 839.941 c 0,-236.91 99.1,-366.121 323.1,-366.121 142.1,0 258.4,47.371 310.1,77.532 V 103.371 C 10673.9,60.3008 10510.2,0 10273.3,0 9739.13,0 9515.17,353.191 9515.17,839.941" /><path
+         id="path24"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 865.578,3372.74 h -611.68 v 611.68 h 611.68 v -611.68" /><path
+         id="path26"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 10125.5,3372.74 h -611.66 v 611.68 h 611.66 v -611.68" /><path
+         id="path28"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 5879.68,3730.25 H 5268 v 611.68 h 611.68 v -611.68" /><path
+         id="path30"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 8002.6,5565.29 h -611.68 v 611.68 h 611.68 v -611.68" /><path
+         id="path32"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 8002.6,6176.97 h -611.68 v 611.68 h 611.68 v -611.68" /><path
+         id="path34"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 5684.38,7400.33 H 5072.7 v 611.68 h 611.68 v -611.68" /><path
+         id="path36"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 865.578,3372.74 h -611.68 v 4027.59 h 611.68 V 3372.74" /><path
+         id="path38"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 5684.38,8012.01 H 5072.7 v 611.68 h 611.68 v -611.68" /><path
+         id="path40"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 8002.6,6788.65 H 253.898 v 611.68 H 8002.6 v -611.68" /><path
+         id="path42"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 5879.68,4341.93 H 5268 v 611.68 h 611.68 v -611.68" /><path
+         id="path44"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 10125.5,3372.74 h -611.66 v 1580.87 h 611.66 V 3372.74" /><path
+         id="path46"
+         style="fill:#5dc694;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 10125.5,4953.61 H 5268 v 611.68 h 4857.5 v -611.68" /></g></g></svg>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Note that imagemagick and inkscape are also required for the makefile to run`
	`2`	`+hexsticker`