Merge pull request #3 from piabrota/eye-logo-png

Add the eye logo as a PNG

docs/7-branding/README.md

@@ -8,5 +8,5 @@ The source of the piabrota identity in this repo.
 | [`voice/`](voice/README.md) | tone and copywriting rules |
 | [`story/`](story/naming-and-mythology.md) | the record of the factory's Norse names, which are Ouroboric's |
 
-The company logo is [`eye.svg`](../drawings/eye.svg), the mark piabrota.art shows: an open green eye on red.
+The company logo is [`eye.svg`](../drawings/eye.svg) (or [`eye.png`](../drawings/eye.png)), the mark piabrota.art shows: an open green eye on red.
 Its source is the site's code in piabrota/nix-os. Ouroboric's logos were removed from this repo: see [NOTICE.md](../../NOTICE.md).

docs/drawings/README.md

@@ -19,3 +19,6 @@ committed files are not its output. The pen is `drawings/pen.nix`, copied from n
 The piabrota logo, the mark [piabrota.art](https://piabrota.art) shows: an open green eye on red. The site
 defines it in code (`eye` in piabrota/nix-os, `site/src/piabrota_site/parts.gleam`), so `drawings/eye.nix`
 holds the same shapes and colours. Change it in nix-os first.
+
+`eye.png` is the same logo at 1024 × 1024, with transparent corners, for places that take no SVG, such as
+an avatar upload. `scripts/drawing.sh` writes it from `eye.svg`.

flake.nix

@@ -10,11 +10,18 @@
       drawing = import ./drawings { inherit (nixpkgs) lib; };
     in
     {
-      # The README drawings: eye.svg, mu.svg, mu.desmos.json and mu-check.svg.
+      # The README drawings: eye.svg, eye.png, mu.svg, mu.desmos.json and mu-check.svg.
       packages = each (system:
         let pkgs = nixpkgs.legacyPackages.${system}; in {
           mu-art = pkgs.linkFarm "mu-art" [
             { name = "eye.svg"; path = pkgs.writeText "eye.svg" drawing.eye; }
+            # The logo as a picture, for places that take no SVG, such as an avatar upload.
+            {
+              name = "eye.png";
+              path = pkgs.runCommand "eye.png" { nativeBuildInputs = [ pkgs.librsvg ]; } ''
+                rsvg-convert -w 1024 -h 1024 ${pkgs.writeText "eye.svg" drawing.eye} -o $out
+              '';
+            }
             { name = "mu.svg"; path = pkgs.writeText "mu.svg" drawing.svg; }
             { name = "mu.desmos.json"; path = pkgs.writeText "mu.desmos.json" drawing.desmos; }
             { name = "mu-check.svg"; path = pkgs.writeText "mu-check.svg" drawing.checkSvg; }
@@ -29,6 +36,7 @@
             ${pkgs.lib.optionalString (drawing.failures != [ ]) "exit 1"}
             art=${self.packages.${system}.mu-art}
             diff -u ${./docs/drawings/eye.svg} $art/eye.svg || { echo 'run scripts/drawing.sh' >&2; exit 1; }
+            cmp ${./docs/drawings/eye.png} $art/eye.png || { echo 'run scripts/drawing.sh' >&2; exit 1; }
             diff -u ${./docs/drawings/mu.svg} $art/mu.svg || { echo 'run scripts/drawing.sh' >&2; exit 1; }
             diff -u ${./docs/drawings/mu.desmos.json} $art/mu.desmos.json || { echo 'run scripts/drawing.sh' >&2; exit 1; }
             touch $out

scripts/drawing.sh

@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
-# Write the README drawings, docs/drawings/eye.svg, mu.svg and its Desmos state, from drawings/*.nix.
+# Write the README drawings, docs/drawings/eye.svg, eye.png, mu.svg and its Desmos state, from drawings/*.nix.
 # nix flake check then fails if a drawing test fails or the committed files are not this output.
 #   drawing.sh
 set -euo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")/.."
 art="$(nix --extra-experimental-features 'nix-command flakes' build .#mu-art --no-link --print-out-paths)"
 cat "$art/eye.svg" >docs/drawings/eye.svg
+cat "$art/eye.png" >docs/drawings/eye.png
 cat "$art/mu.svg" >docs/drawings/mu.svg
 cat "$art/mu.desmos.json" >docs/drawings/mu.desmos.json