From acc07cf6aaa7b75a35638e0caed589442ec48aed Mon Sep 17 00:00:00 2001
From: Rhiannon Morris <rhi@rhiannon.website>
Date: Mon, 10 May 2021 16:16:03 +0200
Subject: [PATCH] more glyphs

---
 laantas-script/Glyphs.hs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/laantas-script/Glyphs.hs b/laantas-script/Glyphs.hs
index 0884ebe..e0de361 100644
--- a/laantas-script/Glyphs.hs
+++ b/laantas-script/Glyphs.hs
@@ -123,8 +123,8 @@ d = G {path = dPath, width = 5}
 dPath = dPart <> P [mA (5,-3), lR (0,8)]
 dPart' = dBase <> dJoin'
 dPart = dBase <> dJoin
-dJoin = P [{-mA (2,5),-} cR (2,0) (3,-0.75) (3,-1.5)]
-dJoin' = P [{-mA (2,5),-} cR (1.75,0) (2.5,-0.75) (2.85,-2.5)]
+dJoin = P [cR (2,0) (3,-0.75) (3,-1.5)]
+dJoin' = P [cR (1.75,0) (2.5,-0.75) (2.85,-2.5)]
 dBase = P [mA (0,0), lR (3.5,0), cR (0,1.5) (-3.5,3.5) (-3.5,5), lR (2,0)]
 dFree = dBase <> P [mA (2,5), lR (1.5,0)]
 dLong = dFree <> shiftX 1.5 dJoin
@@ -147,12 +147,12 @@ dLong = dFree <> shiftX 1.5 dJoin
 ƶl = G {path = ƶlPath, width = 10}
 ƶm = G {path = ƶmPath, width = 11}
 ƶn = G {path = ƶnPath, width = 9.75}
-ƶr = G {path = ƶrPath, width = 10}
+ƶr = G {path = ƶrPath, width = 8}
 ƶč = G {path = ƶčPath, width = 10}
 ƶǧ = G {path = ƶǧPath, width = 10}
 ƶw = G {path = ƶwPath, width = 11}
 ƶh = G {path = ƶhPath, width = 13}
-ƶf = G {path = ƶfPath, width = 11}
+ƶf = G {path = ƶfPath, width = 10}
 ƶj = G {path = ƶjPath, width = 7.5}
 ƶ0 = G {path = ƶ0Path, width = 3.5}
 
@@ -169,7 +169,7 @@ dLong = dFree <> shiftX 1.5 dJoin
 ƶlPath = dPart <> shiftX 5 lPath
 ƶmPath = dPart <> shiftX 5 mPath
 ƶnPath = dPart' <> shiftX 4.75 nPath
-ƶrPath = dPart <> shiftX 5 rCursive
+ƶrPath = dPart <> P [qR (0,1.5) (1,1.5), qR (2,0) (2,-2), mR (0,-6), lR (0,8)]
 ƶčPath = dFree <> shiftX 5 čPath
 ƶǧPath = dFree <> shiftX 5 ǧPath
 ƶwPath = dPart' <> shiftX 5 wPath
@@ -327,7 +327,7 @@ ls = G {path = lsPath, width = 9.5}
 lš = G {path = lšPath, width = 9.5}
 lm = G {path = lmPath, width = 10.5}
 ln = G {path = lnPath, width = 9.25}
-lr = G {path = lrPath, width = 8}
+lr = G {path = lrPath, width = 7.5}
 lč = G {path = lčPath, width = 9.5}
 lǧ = G {path = lǧPath, width = 9.5}
 lw = G {path = lwPath, width = 10.5}
@@ -510,8 +510,6 @@ r0 = G {path = r0Path, width = 5}
 
 rPath = rPart <> P [mA (5,-3), lR (0,8)]
 rPart = P [mA (0,5), cR (3.5,0) (5,-1) (5,-2)]
-rPartCursive = P [mA (0,3), cR (0,1) (1,2) (3,2), cR (1,0) (2,-1) (2,-2)]
-rCursive = rPartCursive <> P [mA (5,-3), lR (0,8)]
 rPartMid = P [mA (0,5), cR (1.25,0) (3.5,-1) (3.5,-2)]
 rPartShort = P [mA (0,5), cR (1,0) (3,-1) (3,-2)]
 rShort = rPartShort <> P [mA (3,-3), lR (0,8)]
@@ -598,9 +596,13 @@ fm = G {path = fmPath, width = 12}
 f0 = G {path = f0Path, width = 6}
 
 fPath = fPart <> P [lR (0,2.5)]
-fPart = P [mA (3.5,2.5), lR (-1, 0), lR (0,2.5),
-           aR 2.5 2.5 0 Large CW (0,-5), lR (1,0),
-           aR 2.5 2.5 0 Small CW (2.5, 2.5)]
+fPart = P [mA (4.25,2.5),
+           cR (0.5,-1) (-1.75,-1) (-1.75, 0),
+           cR (0,1) (1.75,0.75) (1.75,1.75),
+           cR (0,0.35) (-0.15,0.65) (-1.75,0.75),
+           cR (-3.2,0.5) (-3.2,-5) (1,-5.5),
+           cR (1.6,-0.25) (2.5,1) (2.5,3)
+           ]
 fnPath = fPath <> shiftX 7 nPath
 fmPath = fPart <> P [lR (0,1)] <> mBump <> mBump' <> P [mA (12,0), lR (0,5)]
 f0Path = fPath <> P [mA (1.5,7), cR (2.8,-0.35) (3.1,0) (3.5,0.5)]