From f8c3cfa4f6f1fb66f8f0de86d5c4b643b71b1c64 Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Fri, 30 Apr 2021 13:46:57 +0200 Subject: [PATCH] more glyph updates --- laantas-script/Glyphs.hs | 88 ++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/laantas-script/Glyphs.hs b/laantas-script/Glyphs.hs index 22731b8..00c2334 100644 --- a/laantas-script/Glyphs.hs +++ b/laantas-script/Glyphs.hs @@ -44,12 +44,12 @@ tGlyphs = [("t",t), ("tt",tt), ("tk",tk), ("tg",tg), ("td",td), ("tƶ",tƶ), ("tf",tf), ("tj",tj)] t = G {path = tPath, width = 5.5} -tt = G {path = ttPath, width = 6} +tt = G {path = ttPath, width = 7} tk = G {path = tkPath, width = 9} tg = G {path = tgPath, width = 9} td = G {path = tdPath, width = 9} tƶ = G {path = tƶPath, width = 9} -tp = G {path = tpPath, width = 9} +tp = G {path = tpPath, width = 9.5} tb = G {path = tbPath, width = 10} ts = G {path = tsPath, width = 9} tš = G {path = tšPath, width = 9} @@ -65,12 +65,15 @@ tf = G {path = tfPath, width = 10} tj = G {path = tjPath, width = 5} t0 = G {path = t0Path, width = 5} -tPath = P [mA (0,0), lA (5.5,0)] <> shiftX 1.25 aPath <> shiftX 5.25 aPath -tPart ℓ = P [mA (2,0), lR (0,5), mA (0,0), lR (ℓ,0)] -ttPath = P [mA (1,0), lR (0,5), mA (3,0), lR (0,5), mA (5,0), lR (0,5), - mA (0,0), lR (7,0), lR (0,5)] -tkPath = tPart 5 <> shiftX 5 kShort -tgPath = tPart 5 <> shiftX 5 gShort +tPath = P [mA (0,0), lA (5.5,0)] <> shiftX 1.5 aPath <> shiftX 5.25 aPath +tPart ℓ = shiftX 1.5 aPath <> P [mA (0,0), lR (ℓ,0)] +ttPath = P [mA (0,0), lR (7,0)] + <> shiftX 0.75 aPath + <> shiftX 2.75 aPath + <> shiftX 4.75 aPath + <> shiftX 6.75 aPath +tkPath = tPart 5 <> shiftX 5 (aPath <> kBottomShort <> P [mA (4,-3), lR (0,8)]) +tgPath = shiftX 5 gShortHat <> tkPath -- tPart 5 <> shiftX 5 gShort tdPath = tPart 4 <> shiftX 4 dPath tƶPath = tdPath <> P [mA (6,-3), lR (3,0)] tpPath = P [mA (2,-3), lR (0,8), mA (0,-3), lR (5.5,0)] <> shiftX 4 pPath @@ -97,8 +100,11 @@ k = G {path = kPath, width = 5} kk = G {path = kkPath, width = 8} ks = G {path = ksPath, width = 9} -kPath = P [mA (0,0), lR (0,5), sR (3,0) (5,-0.5), mA (5,-3), lR (0,8)] -kShortPart = P [mA (0,0), lR (0,5), sR (2.6,0) (4,-0.5)] +kLeft = P [mA (0,0), cR (0.3,0.5) (0,3) (0,5)] +kBottomShort = P [cR (0,0) (2.6,0) (4,-0.5)] +kPath = kLeft <> kBottom <> P [mA (5,-3), lR (0,8)] +kBottom = P [cR (0,0) (3,0) (5,-0.5)] +kShortPart = kLeft <> kBottomShort kShort = kShortPart <> P [mA (4,-3), lR (0,8)] kkPath = kShortPart <> shiftX 4 kShort ksPath = kShortPart <> shiftX 4 sPath @@ -106,8 +112,10 @@ ksPath = kShortPart <> shiftX 4 sPath g = G {path = gPath, width = 5} -gPath = kPath <> P [mA (2,-3), lR (3,0), mA (5,5)] -gShort = kShort <> P [mA (1.5,-3), lR (2.5,0), mA (4,5)] +gPath = gHat <> kPath +gHat = P [mA (1.5,-2.75), qR (1.5,0.125) (3.5,-0.25)] +gShort = gShortHat <> kShort +gShortHat = P [mA (1.25,-2.75), qR (1.25,0.125) (2.75,-0.25)] d = G {path = dPath, width = 5} @@ -125,12 +133,12 @@ dLong = dFree <> shiftX 1.5 dJoin ("ƶh",ƶh), ("ƶf",ƶf), ("ƶj",ƶj)] ƶ = G {path = ƶPath, width = 5} -ƶt = G {path = ƶtPath, width = 10} +ƶt = G {path = ƶtPath, width = 10.5} ƶk = G {path = ƶkPath, width = 9} ƶg = G {path = ƶgPath, width = 9} ƶd = G {path = ƶdPath, width = 10} ƶƶ = G {path = ƶƶPath, width = 10} -ƶp = G {path = ƶpPath, width = 10} +ƶp = G {path = ƶpPath, width = 10.5} ƶb = G {path = ƶbPath, width = 11} ƶs = G {path = ƶsPath, width = 10} ƶš = G {path = ƶšPath, width = 10} @@ -171,16 +179,18 @@ dLong = dFree <> shiftX 1.5 dJoin pGlyphs = [("p", p), ("pp", pp), ("ps", ps), ("pj", pj)] -p = G {path = pPath, width = 5} +p = G {path = pPath, width = 5.5} pp = G {path = ppPath, width = 8} -ps = G {path = psPath, width = 10} -pj = G {path = pjPath, width = 9} +ps = G {path = psPath, width = 10.5} +pj = G {path = pjPath, width = 9.5} -pPath = P [mA (1.5,-3), lR (0,8), sR (-1.5,-3) (-1.5,-5), lR (5,0), lR (0,5)] +pPart = + Shift 1.5 (-3) aPath <> + P [lR (0,3), cR (-1,-3) (-2,-4) (0,-5), cR (1,-0.5) (2.5,-0.5) (4,0)] +pPath = pPart <> shiftX 5.25 aPath ppPath = P [mA (1.5,-3), lR (0,8), sR (-1.5,-3) (-1.5,-5), mA (4,-3), lR (0,8), mA (0,0), lR (8,0), lR (0,5)] -psPath = P [mA (1.5,-3), lR (0,8), sR (-1.5,-3) (-1.5,-5), lR (5,0)] - <> shiftX 5 sPath +psPath = pPart <> shiftX 5.5 sPath pjPath = pPath <> P [mA (5,0), lR (4,0), lR (0,5)] @@ -189,8 +199,8 @@ bGlyphs = [("b", b), ("bj", bj)] b = G {path = bPath, width = 6} bj = G {path = bjPath, width = 9} -bPath = wPart <> P [mA (2,-3), lR (4,0), lR (0,8)] -bjPath = bPath <> P [mA (6,-3), lR (3,0), lR (0,8)] +bPath = shiftX 1 gHat <> wPart <> P [mA (6,-3), lR (0,8)] +bjPath = bPath <> P [mA (6,1), cR (0.25,-2) (3,-2.5) (3,-1), lR (0,5)] sGlyphs = [("s",s), ("st",st), ("sk",sk), ("sg",sg), ("sd",sd), ("sƶ",sƶ), @@ -198,13 +208,13 @@ sGlyphs = [("s",s), ("st",st), ("sk",sk), ("sg",sg), ("sd",sd), ("sƶ",sƶ), ("sn",sn), ("sr",sr), ("sč",sč), ("sǧ",sǧ), ("sw",sw), ("sh",sh), ("sf",sf), ("sj",sj)] -s = G {path = sPath, width = 5} -st = G {path = stPath, width = 9} +s = G {path = sPath, width = 5.125} +st = G {path = stPath, width = 9.5} sk = G {path = skPath, width = 9} sg = G {path = sgPath, width = 9} sd = G {path = sdPath, width = 9} sƶ = G {path = sƶPath, width = 9} -sp = G {path = spPath, width = 10} +sp = G {path = spPath, width = 9.5} sb = G {path = sbPath, width = 10} ss = G {path = ssPath, width = 10} sš = G {path = sšPath, width = 10} @@ -220,7 +230,7 @@ sf = G {path = sfPath, width = 10} sj = G {path = sjPath, width = 6} s0 = G {path = s0Path, width = 5} -sPath = sPartLine <> P [mA (5,0), lR (0,5)] +sPath = sPartLine <> shiftX 5 aPath sPart = P [mA (0, 0), lR (0, 3.5), aR 1.5 1.5 0 Small CCW (3,0), lR (0,-3.5)] sPartLine = sPart <> P [mA (3,0), lR (2,0)] stPath = sPartLine <> shiftX 4 tPath @@ -228,7 +238,7 @@ skPath = sPartLine <> shiftX 5 kShort sgPath = sPartLine <> shiftX 5 gShort sdPath = sPart <> P [mA (3,0), lR (1,0)] <> shiftX 4 dPath sƶPath = sPart <> P [mA (3,0), lR (1,0)] <> shiftX 4 ƶPath -spPath = sPart <> P [mA (3,0), lR (3.5,0)] <> shiftX 5 pPath +spPath = sPart <> shiftX 4 pPath sbPath = sPart <> shiftX 4 bPath <> P [mA (3,0), lR (0,-3), lR (3.5,0), mA (10,5)] ssPath = sPartLine <> shiftX 5 sPath sšPath = sPartLine <> shiftX 5 šPath @@ -251,7 +261,7 @@ s0Path = sPath <> P [mA (1.5,7), cR (1.8,-0.25) (2.6,0) (3,0.5)] ("šn",šn), ("šr",šr), ("šč",šč), ("šǧ",šǧ), ("šw",šw), ("šh",šh), ("šf",šf), ("šj",šj)] -š = G {path = šPath, width = 5} +š@(G {path = šPath}) = s2š s šš = ss {path = ššPath} šp = sp {path = špPath} šb = sb {path = šbPath} @@ -273,13 +283,11 @@ s0Path = sPath <> P [mA (1.5,7), cR (1.8,-0.25) (2.6,0) (3,0.5)] šj = s2š sj š0 = s2š s0 -šPath = sPath <> šLine <> P [mA (5,5)] šLine = P [mA (0.5,-1.5), lR (2,0)] ššPath = ssPath <> P [mA (1,-2), lR (7,0), mA (10,5)] -špPath = spPath <> P [mA (0,-3), lR (3,0)] +špPath = šLine <> spPath šbPath = sPart <> šLine <> P [mA (3,0), lR (4,0)] <> shiftX 4 bPath -s2š g@(G {path, width}) = - g {path = path <> šLine <> P [mA (width,5)]} +s2š g@(G {path}) = g {path = šLine <> path} lGlyphs = [("l",l), ("ll", ll), ("lt",lt), ("lk",lk), ("lg",lg), ("ld",ld), @@ -289,12 +297,12 @@ lGlyphs = [("l",l), ("ll", ll), ("lt",lt), ("lk",lk), ("lg",lg), ("ld",ld), l = G {path = lPath, width = 5} ll = G {path = llPath, width = 10} -lt = G {path = ltPath, width = 10} +lt = G {path = ltPath, width = 10.5} lk = G {path = lkPath, width = 9} lg = G {path = lgPath, width = 9} ld = G {path = ldPath, width = 10} lƶ = G {path = lƶPath, width = 10} -lp = G {path = lpPath, width = 10} +lp = G {path = lpPath, width = 10.5} lb = G {path = lbPath, width = 11} ls = G {path = lsPath, width = 10} lš = G {path = lšPath, width = 10} @@ -351,12 +359,12 @@ mGlyphs = [("m",m), ("mt",mt), ("mk",mk), ("mg",mg), ("md",md), ("mƶ",mƶ), ("mf",mf), ("mj",mj)] m = G {path = mPath, width = 6} -mt = G {path = mtPath, width = 9.5} +mt = G {path = mtPath, width = 10} mk = G {path = mkPath, width = 10} mg = G {path = mgPath, width = 10} md = G {path = mdPath, width = 12} mƶ = G {path = mƶPath, width = 12} -mp = G {path = mpPath, width = 12} +mp = G {path = mpPath, width = 12.5} mb = G {path = mbPath, width = 12} ms = G {path = msPath, width = 11} mš = G {path = mšPath, width = 11} @@ -405,12 +413,12 @@ nGlyphs = [("n", n), ("nt", nt), ("nk", nk), ("ng", ng), ("nd", nd), ("nƶ", nƶ ("nw", nw), ("nh", nh), ("nf", nf), ("nj", nj)] n = G {path = nPath, width = 5} -nt = G {path = ntPath, width = 10} +nt = G {path = ntPath, width = 10.5} nk = G {path = nkPath, width = 9} ng = G {path = ngPath, width = 9} nd = G {path = ndPath, width = 10} nƶ = G {path = nƶPath, width = 10} -np = G {path = npPath, width = 9.5} +np = G {path = npPath, width = 10} nb = G {path = nbPath, width = 11} ns = G {path = nsPath, width = 10} nš = G {path = nšPath, width = 10} @@ -461,12 +469,12 @@ rGlyphs = [("r", r), ("rt", rt), ("rk", rk), ("rg", rg), ("rd", rd), ("rƶ", rƶ ("rw", rw), ("rh", rh), ("rf", rf), ("rj", rj)] r = G {path = rPath, width = 5} -rt = G {path = rtPath, width = 7} +rt = G {path = rtPath, width = 7.5} rk = G {path = rkPath, width = 7} rg = G {path = rgPath, width = 7} rd = G {path = rdPath, width = 9.5} rƶ = G {path = rƶPath, width = 9.5} -rp = G {path = rpPath, width = 9.5} +rp = G {path = rpPath, width = 10} rb = G {path = rbPath, width = 10.5} rs = G {path = rsPath, width = 9.5} rš = G {path = ršPath, width = 9.5}