From aed58f099d6fd94f57a328f10dbc5b7e790d5fb6 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Tue, 27 Nov 2018 14:28:36 +1300
Subject: [PATCH] my attempt at a check mark

---
 README.font.md                      |  31 ---------------------------
 font/README.md                      |   9 ++++++++
 font/make-font.sh                   |  18 ++++++++++++++++
 font/subiquity.bdf                  |  32 ++++++++++++++++++++++++++++
 font/subiquity.equivalents          |  16 ++++++++++++++
 subiquity.psf => font/subiquity.psf | Bin 10710 -> 10710 bytes
 font/subiquity.set                  |   2 ++
 snapcraft.yaml                      |   2 ++
 8 files changed, 79 insertions(+), 31 deletions(-)
 delete mode 100644 README.font.md
 create mode 100644 font/README.md
 create mode 100755 font/make-font.sh
 create mode 100644 font/subiquity.bdf
 create mode 100644 font/subiquity.equivalents
 rename subiquity.psf => font/subiquity.psf (60%)
 create mode 100644 font/subiquity.set

diff --git a/README.font.md b/README.font.md
deleted file mode 100644
index b6dfabbd..00000000
--- a/README.font.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Subiquity comes with its own console font, which differs from the
-standard one in how arrow-like glyphs are rendered; the standard font
-renders them as arrowheaded forms like → but we want solid triangles
-like ▶.
-
-I built the font like this:
-
-
-```
-$ apt source console-setup
-$ cd console-setup-*/Fonts
-$ cat > my.equivalents <<EOF
-U+2191 U+25B4 U+25B2
-# U+2191:   UPWARDS ARROW
-# U+25B4:   BLACK UP-POINTING SMALL TRIANGLE
-# U+25B2:   BLACK UP-POINTING TRIANGLE
-U+2193 U+25BE U+25BC
-# U+2193:   DOWNWARDS ARROW
-# U+25BE:   BLACK DOWN-POINTING SMALL TRIANGLE
-# U+25BC:   BLACK DOWN-POINTING TRIANGLE
-U+2190 U+25C2 U+25C0
-# U+2190:   LEFTWARDS ARROW
-# U+25C2:   BLACK LEFT-POINTING SMALL TRIANGLE
-# U+25C0:   BLACK LEFT-POINTING TRIANGLE
-U+2192 U+25B8 U+25B6
-# U+2192:   RIGHTWARDS ARROW
-# U+25B8:   BLACK RIGHT-POINTING SMALL TRIANGLE
-# U+25B6:   BLACK RIGHT-POINTING TRIANGLE
-EOF
-$ ./bdf2psf --log ./my.log  ./bdf/georgian16.bdf+./bdf/unifont.bdf+./bdf/h16.bdf+./bdf/etl16-unicode.bdf  ./standard.equivalents+./my.equivalents  ./ascii.set+./linux.set+./fontsets/Uni2.512+:./useful.set 512 ./subiquity.psf
-```
diff --git a/font/README.md b/font/README.md
new file mode 100644
index 00000000..2b5e159a
--- /dev/null
+++ b/font/README.md
@@ -0,0 +1,9 @@
+Subiquity comes with its own console font, which differs from the
+standard one in how arrow-like glyphs are rendered; the standard font
+renders them as arrowheaded forms like → but we want solid triangles
+like ▶.
+
+We also want a check mark (✓) and I don't like the one in h16.bdf.
+
+Make the font using the `make-font.sh` script (can't do it at snap
+build time because it uses "apt source").
diff --git a/font/make-font.sh b/font/make-font.sh
new file mode 100755
index 00000000..50eef3e8
--- /dev/null
+++ b/font/make-font.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -eux
+SUBIQUITY_FONT_DIR=$(realpath $(dirname $0))
+tmp=$(mktemp -d)
+cleanup () {
+    rm -rf $tmp
+}
+trap cleanup EXIT
+apt source console-setup
+cd console-setup-*/Fonts
+./bdf2psf \
+    --log ${SUBIQUITY_FONT_DIR}/subiquity.log \
+    ${SUBIQUITY_FONT_DIR}/subiquity.bdf+./bdf/georgian16.bdf+./bdf/unifont.bdf+./bdf/h16.bdf+./bdf/etl16-unicode.bdf \
+    ${SUBIQUITY_FONT_DIR}/subiquity.equivalents+./standard.equivalents \
+    ${SUBIQUITY_FONT_DIR}/subiquity.set+./ascii.set+./linux.set+./fontsets/Uni2.512+:./useful.set \
+    512 \
+    ${SUBIQUITY_FONT_DIR}/subiquity.psf
+
diff --git a/font/subiquity.bdf b/font/subiquity.bdf
new file mode 100644
index 00000000..533644cf
--- /dev/null
+++ b/font/subiquity.bdf
@@ -0,0 +1,32 @@
+STARTFONT 2.1
+FONT -gbdfed-Unknown-Medium-R-Normal--16-120-96-96-P-100-FontSpecific-0
+SIZE 16 75 75
+FONTBOUNDINGBOX 8 14 0 -1
+STARTPROPERTIES 8
+POINT_SIZE 160
+PIXEL_SIZE 16
+RESOLUTION_X 75
+RESOLUTION_Y 75
+FONT_ASCENT 14
+FONT_DESCENT 2
+AVERAGE_WIDTH 80
+_GBDFED_INFO "Edited with gbdfed 1.6."
+ENDPROPERTIES
+CHARS 1
+STARTCHAR U+2713
+ENCODING 10003
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 9 0 0
+BITMAP
+01
+03
+06
+CC
+48
+78
+30
+30
+20
+ENDCHAR
+ENDFONT
diff --git a/font/subiquity.equivalents b/font/subiquity.equivalents
new file mode 100644
index 00000000..e0648951
--- /dev/null
+++ b/font/subiquity.equivalents
@@ -0,0 +1,16 @@
+U+2191 U+25B4 U+25B2
+# U+2191:   UPWARDS ARROW
+# U+25B4:   BLACK UP-POINTING SMALL TRIANGLE
+# U+25B2:   BLACK UP-POINTING TRIANGLE
+U+2193 U+25BE U+25BC
+# U+2193:   DOWNWARDS ARROW
+# U+25BE:   BLACK DOWN-POINTING SMALL TRIANGLE
+# U+25BC:   BLACK DOWN-POINTING TRIANGLE
+U+2190 U+25C2 U+25C0
+# U+2190:   LEFTWARDS ARROW
+# U+25C2:   BLACK LEFT-POINTING SMALL TRIANGLE
+# U+25C0:   BLACK LEFT-POINTING TRIANGLE
+U+2192 U+25B8 U+25B6
+# U+2192:   RIGHTWARDS ARROW
+# U+25B8:   BLACK RIGHT-POINTING SMALL TRIANGLE
+# U+25B6:   BLACK RIGHT-POINTING TRIANGLE
diff --git a/subiquity.psf b/font/subiquity.psf
similarity index 60%
rename from subiquity.psf
rename to font/subiquity.psf
index 6b6368c7c13855e61ac79d2aab47b69ef2325147..4c7ab9b9b8f9f2fd0581dd53f7d8d584e9b8fef5 100644
GIT binary patch
delta 833
zcmYjO&rcIU6n?W^%xGnIDGgMzmhE<@ko8irAsk4PZZ_I-=s`3Q!-=S8FiMCqCGZCr
z%H!n85F_dVl*Q_Sn1+)ko|JHs@IP?TgJyiYONE#H^1biPykD~ilLwROQ8i&eXe@E=
zTXmsWv;dlFiF0n6<+5oui<#z~BfP;bV~H7cCj+oZhp|P80Niv*p9mrnu6afSR~zaX
zZCDK}YKjk8Nx9}DQ~J?Rc+jsLcHurt2b}+8+Qk&Wpc<L)kKyt8bqyfn090y`jpF)+
zWi1L+Y&#u|gd<6tN{7?T$G2(#cq_RU{7%lXOP(|C(C2jqkH!uYak<;W{qEu-s62j;
z({-R>7)G`yv^Y5C`~FkU^Jb<2JZ~H-VSDOt6gx=`C$?BuA`71_)><l+vTfV*<kC_n
zgS0*BT0K@6sMTE8G+nnA4*y77!;F5l`v2WeQaCS%8<sm&fqqSc9_Zva94)d%#*E?N
z)1`1u@5O9?A3oO&J{xbA#qatsU#M2=RPkAGtWUDwcF&eJ&^sjM8<297a7cJi_#*yF
zDQ_|yu*&rog*FH?Ov-zNW^P+-iyhI-Nr|~#u`50cB!4y65-ssbtdhTyYm2tn6D#D;
zGAZW>0}7Q_g16Qag%wcbmsklm@>ken{E;70<{AFU7nDjCEvJAJPP^+R^?Zf87#w*`
z-WGhN{D8b2LQ<9Th*%?TC#2Mg(}WMOOR7)BY2l8)rwjLO8k*qIp-=clvFpU|h^xdO
ZiEG3Ygl+O)h)p5ol!|-eZeSH!iGPfy<eLBh

delta 820
zcmYLG&ubG=5T3V5>zdfjHil-EWt(jF#SlS?me|7*nq|?hf`|5^B3Me*Ydu(t$c7ZW
zigEk{q^MO7Rl8MtC{n73UKM&%LGa?S7ca_l-fp8G`^~R6J2P+I_SE)Nx{*%l-NI=1
zte#O-(`+_PQ&qb&Kky10K%bQ~#{g)nJ>V7_bpT*`Aq*F$$=F4|6^2&-u5-)>z@K}p
zA{d72hG8!WAPimCFpw$5Xh`|mr|ruF45wrG{#c}_-<bwrP={6!qk%hnm$W$0vh6}V
z1}<e5DN9uW=98=dk7jM0&ECs|x~^M;646ffIy(@z4#&sGcW3Y%*P+h?TpaLp8I&b^
z65kDsv^~#-mTX4d^pWJhG2i!ZdY(6PA@N%=<XRG+ZssINd@Y~P+qUg_qSKL)AgI?(
zvtAE^UOoVw+l_juBqMF<!~jI?R_6c8F`qkLQ`M%tX!Bn?8bzYbSW=JPh_-BCH@82d
z*J|;_=nYnKCOSpkm`j#oCCLB_6BB2s-fjGpt3?_8G)tvbJ${vogAcW#Cm_TM@e6U1
z330jlf&UR`m70??<i4WtGI5sdIpS5~L51Rco!>1>Da0n<;&;kYQW-j{QqC%0<K429
zLTvCi9LrKhPfIrxHj2E`Vb^fEa+uBI=gJ|aW#R8i6|0WJvUt*Y+oxBAcz`)ReB==|
ze@uJ^AE|UimX;Rc8|fVB&6E%Y(nG|Tu#v)PUUxlmUQog%o8~6^<ewn^qSyrK=cEJD
buSuUGeU7+F_I<v>@jXAUtU+W|*HeE1H+ku9

diff --git a/font/subiquity.set b/font/subiquity.set
new file mode 100644
index 00000000..7445b4b4
--- /dev/null
+++ b/font/subiquity.set
@@ -0,0 +1,2 @@
+U+2713
+# U+2713:   CHECK MARK
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 1540ebd5..d2192ef2 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -85,6 +85,8 @@ parts:
       - kbdnames.txt
   font:
     plugin: dump
+    organize:
+      font/subiquity.psf: subiquity.psf
     stage:
       - subiquity.psf
   probert: