From b7617b9d9794670b8cc430d07e15dc8b875119fd Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Mon, 3 May 2021 18:47:34 +0200 Subject: [PATCH] more glyphs --- laantas-script/Glyphs.hs | 148 ++++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 73 deletions(-) diff --git a/laantas-script/Glyphs.hs b/laantas-script/Glyphs.hs index 622b8df..0884ebe 100644 --- a/laantas-script/Glyphs.hs +++ b/laantas-script/Glyphs.hs @@ -62,10 +62,11 @@ tǧ = G {path = tǧPath, width = 10} tw = G {path = twPath, width = 10} th = G {path = thPath, width = 12} tf = G {path = tfPath, width = 10} -tj = G {path = tjPath, width = 5} +tj = G {path = tjPath, width = 4.75} t0 = G {path = t0Path, width = 5} tPath = P [mA (0,0), lA (5.5,0)] <> shiftX 1.5 aPath <> shiftX 5.25 aPath +tNarrow = P [mA (0,0), lA (5,0)] <> shiftX 1.5 aPath <> shiftX 4.75 aPath tPart ℓ = shiftX 1.5 aPath <> P [mA (0,0), lR (ℓ,0)] ttPath = P [mA (0,0), lR (7,0)] <> shiftX 0.75 aPath @@ -73,7 +74,7 @@ ttPath = P [mA (0,0), lR (7,0)] <> 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 +tgPath = shiftX 5 gShortHat <> tkPath 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 (6,0)] <> shiftX 4 pPath @@ -89,8 +90,7 @@ tǧPath = tPart 4 <> shiftX 5 ǧPath twPath = tPart 6 <> shiftX 4 wPath thPath = tPart 4 <> shiftX 4 hPath tfPath = tPart 4 <> shiftX 4 fPath -tjPath = P [mA (2,0), lR (0,5), mA (0,0), lR (4,0), mA (0,-3), - lR (5,0), lR (0,8)] +tjPath = tPart 3.5 <> shiftX (-0.5) jTall t0Path = tPath <> P [mA (1.5,7), cR (1.8,-0.25) (3.1,0) (3.5,0.5)] @@ -146,14 +146,14 @@ dLong = dFree <> shiftX 1.5 dJoin ƶš = G {path = ƶšPath, width = 10} ƶl = G {path = ƶlPath, width = 10} ƶm = G {path = ƶmPath, width = 11} -ƶn = G {path = ƶnPath, width = 10} +ƶn = G {path = ƶnPath, width = 9.75} ƶr = G {path = ƶrPath, width = 10} ƶč = 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} -ƶj = G {path = ƶjPath, width = 7} +ƶj = G {path = ƶjPath, width = 7.5} ƶ0 = G {path = ƶ0Path, width = 3.5} ƶPath = gHat <> dPath @@ -168,21 +168,21 @@ dLong = dFree <> shiftX 1.5 dJoin ƶšPath = dPart <> shiftX 5 šPath ƶlPath = dPart <> shiftX 5 lPath ƶmPath = dPart <> shiftX 5 mPath -ƶnPath = dPart' <> shiftX 5 nPath -- TODO dPart or dPart'? +ƶnPath = dPart' <> shiftX 4.75 nPath ƶrPath = dPart <> shiftX 5 rCursive ƶčPath = dFree <> shiftX 5 čPath ƶǧPath = dFree <> shiftX 5 ǧPath ƶwPath = dPart' <> shiftX 5 wPath ƶhPath = dPart <> shiftX 5 hPath ƶfPath = dFree <> shiftX 4 fPath -ƶjPath = dFree <> shiftX 2 jPath +ƶjPath = dFree <> shiftX 4.5 jPathShort ƶ0Path = dFree <> P [mA (1,7), cR (1.8,-0.25) (2.2,0) (2.5,0.5)] pGlyphs = [("p", p), ("pp", pp), ("ps", ps), ("pj", pj)] p = G {path = pPath, width = 5.5} -pp = G {path = ppPath, width = 8} +pp = G {path = ppPath, width = 9} ps = G {path = psPath, width = 10.5} pj = G {path = pjPath, width = 10} @@ -197,7 +197,6 @@ ppPath = P [mA (1.5,5), cR (-1,-3) (-2,-4) (0,-5), cR (1,-0.5) (2.5,-0.5) (7.5,0)] <> shiftX 8.75 aPath psPath = pPart <> shiftX 5.5 sPath --- pjPath = pPath <> shiftX 7 jPath pjPath = shiftX 2 pInit <> P [cR (-1,-3) (-2,-4) (0,-5), cR (1,-0.5) (4,-1) (4,1), @@ -224,59 +223,55 @@ sGlyphs = [("s",s), ("st",st), ("sk",sk), ("sg",sg), ("sd",sd), ("sƶ",sƶ), ("sf",sf), ("sj",sj)] s = G {path = sPath, width = 5.125} -st = G {path = stPath, width = 9.5} +st = G {path = stPath, width = 8.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 = 9.5} -sb = G {path = sbPath, width = 10} +sb = G {path = sbPath, width = 10.5} ss = G {path = ssPath, width = 10} sš = G {path = sšPath, width = 10} -sl = G {path = slPath, width = 9.5} -sm = G {path = smPath, width = 11} -sn = G {path = snPath, width = 10} -sr = G {path = srPath, width = 9} +sl = G {path = slPath, width = 9} +sm = G {path = smPath, width = 10.5} +sn = G {path = snPath, width = 9.5} +sr = G {path = srPath, width = 7} sč = G {path = sčPath, width = 9} sǧ = G {path = sǧPath, width = 10} sw = G {path = swPath, width = 10} sh = G {path = shPath, width = 13} -sf = G {path = sfPath, width = 10} -sj = G {path = sjPath, width = 6} +sf = G {path = sfPath, width = 10.25} +sj = G {path = sjPath, width = 5} s0 = G {path = s0Path, width = 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)] -sPart = P [mA (0, 0), +sPath = sPartLine <> shiftX 4.75 aPath +sPart' = P [mA (0, 0), cR (0.15,0.5) (0,2.5) (0,3.5), - aR 1.5 1.5 0 Small CCW (3,0), - qR (0,-3) (-0.5, -3.5)] -sPartIso = P [mA (0, 0), - cR (0.15,0.5) (0,2.5) (0,3.5), - aR 1.5 1.5 0 Small CCW (3,0), - cR (0,-0.5) (-0.15,-2.5) (0,-3.5)] -sPartLine = sPart <> P [mA (2.5,0), lR (2.5,0)] -stPath = sPartLine <> shiftX 4 tPath + aR 1.5 1.5 0 Small CCW (3,0)] +sPart = sPart' <> P [qR (0,-3) (-0.5,-3.5)] +sPartIso = sPart' <> P [cR (0,-0.5) (-0.15,-2.5) (0,-3.5)] +sPartLine = sPart <> P [mA (2.5,0), qR (1,0.25) (2.5,0)] +stPath = sPart <> P [lR (1,0)] <> shiftX 3.5 tNarrow skPath = sPartLine <> shiftX 5 kShort sgPath = sPartLine <> shiftX 5 gShort sdPath = sPart <> P [mA (2.5,0), lR (1.5,0)] <> shiftX 4 dPath sƶPath = sPart <> P [mA (2.5,0), lR (1.5,0)] <> shiftX 4 ƶPath spPath = sPartIso <> shiftX 4 pPath --- TODO -sbPath = sPartIso <> shiftX 4 bPath <> P [mA (3,0), lR (0,-3), lR (3.5,0), mA (10,5)] +sbPath = sPart' <> + P [cR (0,-2.5) (-0.25,-2.5) (0,-6.5), qR (2,0.5) (7.5,0), lR (0,8)] <> + shiftX 4.5 wPart <> P [mA (10.5,5)] ssPath = sPartLine <> shiftX 5 sPath sšPath = sPartLine <> shiftX 5 šPath -slPath = sPart <> P [mA (2.5,0), lR (3.5,0)] <> shiftX 4.5 lPath -smPath = sPart <> P [mA (2.5,0), lR (3,0)] <> shiftX 5 mPath -snPath = sPart <> P [mA (2.5,0), lR (4.5,0)] <> shiftX 5 nPath -srPath = sPart <> P [mA (2.5,0), lR (4.5,0)] <> shiftX 4 rShort +slPath = sPart <> P [mA (2.5,0), qR (1.25,0.5) (3.5,0)] <> shiftX 4.5 lPath +smPath = sPartLine <> shiftX 4.5 mPath +snPath = sPart <> P [mA (2.5,0), qR (1.5,0.5) (4.5,0)] <> shiftX 4.5 nPath +srPath = sPart <> P [mA (2.5,0), qR (2,0.75) (4.5,0.25)] <> shiftX 4 rShort sčPath = sPart <> P [mA (2.5,0), lR (1.5,0)] <> shiftX 3 čFlat sǧPath = sPartIso <> shiftX 4 ǧPath swPath = sPart <> P [mA (2.5,0), lR (4,0)] <> shiftX 4 wPath shPath = sPartIso <> shiftX 5 hPath -sfPath = sPartIso <> shiftX 4 fPath -sjPath = P [mA (0,0), lR (0,3.5), aR 1.5 1.5 0 Small CCW (3,0), lR (0,-1.5), - mA (3,0), lR (3,0), lR (0,5), mA (3,2), lR (3,0)] +sfPath = sPartIso <> shiftX 4.25 fPath +sjPath = sPartLine <> jTall s0Path = sPath <> P [mA (1.5,7), cR (1.8,-0.25) (2.6,0) (3,0.5)] @@ -307,8 +302,8 @@ s0Path = sPath <> P [mA (1.5,7), cR (1.8,-0.25) (2.6,0) (3,0.5)] šj = s2š sj š0 = s2š s0 -šLine = P [mA (0.5,-1.5), lR (2,0)] -ššPath = ssPath <> P [mA (1,-2), lR (7,0), mA (10,5)] +šLine = P [mA (0.5,-2.25), qR (1.5,-0.25) (2,0.25)] +ššPath = P [mA (0.5,-2), cR (2,-1) (5,1) (7,0)] <> ssPath špPath = šLine <> spPath šbPath = sPart <> šLine <> P [mA (3,0), lR (4,0)] <> shiftX 4 bPath s2š g@(G {path}) = g {path = šLine <> path} @@ -331,14 +326,14 @@ lb = G {path = lbPath, width = 10.5} 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.5} -lr = G {path = lrPath, width = 9.5} +ln = G {path = lnPath, width = 9.25} +lr = G {path = lrPath, width = 8} lč = G {path = lčPath, width = 9.5} lǧ = G {path = lǧPath, width = 9.5} lw = G {path = lwPath, width = 10.5} lh = G {path = lhPath, width = 12.5} lf = G {path = lfPath, width = 10.5} -lj = G {path = ljPath, width = 4.5} +lj = G {path = ljPath, width = 5} l0 = G {path = l0Path, width = 3.75} lPath = lPart <> P [mA (4.5,0), lR (0,5)] @@ -363,14 +358,14 @@ lbPath = lPart' <> shiftX 4.5 bPath lsPath = lPart <> shiftX 4.5 sPath lšPath = lPart <> shiftX 4.5 šPath lmPath = lPart <> shiftX 4.5 mPath -lnPath = lPart' <> shiftX 4.5 nPath -- TODO lPart or lPart'? -lrPath = lPart <> shiftX 4.5 rCursive +lnPath = lPart' <> shiftX 4.25 nPath +lrPath = lPart <> P [qR (0,1.5) (1,1.5), qR (2,0) (2,-2), mR (0,-6), lR (0,8)] lčPath = lFree' <> shiftX 4.5 čPath lǧPath = lFree' <> shiftX 4.5 ǧPath lwPath = lPart' <> shiftX 4.5 wPath lhPath = lPart <> shiftX 4.5 hPath lfPath = lFree' <> shiftX 4.5 fPath -ljPath = lPart <> shiftX 0.5 gShortHat <> P [mA (4.5,-3), lR (0,8)] +ljPath = lFree' <> jTall l0Path = lFree <> P [mA (1.25,7), cR (1.8,-0.25) (2.2,0) (2.5,0.5)] @@ -439,49 +434,51 @@ 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 = 10} +np = G {path = npPath, width = 10.25} nb = G {path = nbPath, width = 11} ns = G {path = nsPath, width = 10} nš = G {path = nšPath, width = 10} nl = G {path = nlPath, width = 10} nm = G {path = nmPath, width = 11} nn = G {path = nnPath, width = 10} -nr = G {path = nrPath, width = 6} +nr = G {path = nrPath, width = 6.5} nč = G {path = nčPath, width = 10} -nǧ = G {path = nǧPath, width = 9.5} +nǧ = G {path = nǧPath, width = 9.75} nw = G {path = nwPath, width = 11} nh = G {path = nhPath, width = 13} -nf = G {path = nfPath, width = 10.5} -nj = G {path = njPath, width = 5} +nf = G {path = nfPath, width = 10.75} +nj = G {path = njPath, width = 5.25} n0 = G {path = n0Path, width = 3.5} nPath = nPart <> P [mA (5,0), lR (0,5)] -nPart = nPart' <> dJoin -nPart' = P [mA (3.5,1.5), cR (0,-1) (-0.5,-1.5) (-1,-1.5), - aR 2.5 2.5 0 Large CCW (0,5)] -nLong = nPart' <> P [mA (2.5,5), lR (1.5,0)] <> shiftX 1.5 dJoin +nPart = nPart' <> P [cR (1.6,-0.25) (2.5,-1.75) (2.5,-2.5)] +nPart' = P [mA (3.5,1), cR (0.5,-1) (-0.5,-1.125) (-1,-1), + cR (-3.2,0.5) (-3.2,5.5) (0,5)] +nLong = nPart' <> P [cR (1.6,-0.25) (4,-1) (4,-2.5)] nFlat = P [mA (5,0), lR (-2.5,0), aR 2.5 2.5 0 Large CCW (0,5), cR (0.5,0) (1,-0.5) (1,-1.5)] +nFree = nPart' <> P [qR (0.8,-0.125) (1.5,-1)] +nFree' = nPart' <> P [qR (0.8,-0.125) (1,-1)] ntPath = nLong <> shiftX 5 tPath nkPath = nFlat <> shiftX 5 kShort ngPath = nFlat <> shiftX 5 gShort ndPath = nFlat <> shiftX 5 dPath nƶPath = nFlat <> shiftX 5 ƶPath -npPath = ńPath <> shiftX 4.5 pPath +npPath = nFree <> shiftX 4.75 pPath nbPath = nFlat <> P [mA (5,0), lR (2,0)] <> shiftX 5 bPath nsPath = nFlat <> shiftX 5 sPath nšPath = nFlat <> shiftX 5 šPath nlPath = nFlat <> P [mA (5,0), lR (1,0)] <> shiftX 5 lPath nmPath = nFlat <> P [mA (5,0), lR (0.5,0)] <> shiftX 5 mPath nnPath = nFlat <> P [mA (5,0), lR (2,0)] <> shiftX 5 nPath -nrPath = nPart' <> P [mA (2.5,5), lR (0.5,0)] <> shiftX 3 rShort +nrPath = nFree' <> P [qR (0,1) (1,1), qR (2,0) (2,-2), mR (0,-6), lR (0,8)] nčPath = nFlat <> shiftX 4 čFlat -nǧPath = ńPath <> shiftX 4.5 ǧPath +nǧPath = nFree' <> shiftX 4.75 ǧPath nwPath = nFlat <> P [mA (5,0), lR (2,0)] <> shiftX 5 wPath nhPath = nFlat <> shiftX 5 hPath -nfPath = ńPath <> shiftX 4.5 fPath -njPath = ńPath <> P [mA (1,-3), lR (4,0), lR (0,8)] -n0Path = ńPath <> P [mA (1,7), cR (1.8,-0.25) (2.2,0) (2.5,0.5)] +nfPath = nFree' <> shiftX 4.75 fPath +njPath = nFree' <> jTall +n0Path = nFree <> P [mA (1,7), cR (1.8,-0.25) (2.2,0) (2.5,0.5)] rGlyphs = [("r", r), ("rt", rt), ("rk", rk), ("rg", rg), ("rd", rd), ("rƶ", rƶ), @@ -608,9 +605,11 @@ 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)] -j = G {path = jPath, width = 5} +j = G {path = jPath, width = 4} -jPath = P [mA (0,0), lR (5,0)] <> shiftX 4.75 aPath +jPath = P [mA (0,0), qR (1.25,0.5) (4,0)] <> shiftX 3.75 aPath +jPathShort = P [mA (0,0), qR (1,0.25) (3,0)] <> shiftX 2.75 aPath +jTall = gHat <> P [lR (0,8)] vGlyphs = [("a", a), ("á", á), ("i", i), ("í", í), ("u", u), ("ú", ú), @@ -628,7 +627,7 @@ au = G {path = auPath, width = 4.5} ia = G {path = iaPath, width = 5} ua = G {path = uaPath, width = 4.5} ḿ = G {path = ḿPath, width = 6} -ń = G {path = ńPath, width = 3} +ń = G {path = ńPath, width = 4} ł = G {path = łPath, width = 3.75} ŕ = G {path = ŕPath, width = 5} @@ -650,9 +649,7 @@ uaPath = uNarrow <> shiftX 4.5 aPath aR 1.5 1.5 0 Small CCW (3,0), lR (0,-2), mA (5.5,0), cR (0.25,0.2) (0.5,2.25) (0.5,3.5), aR 1.5 1.5 0 Small CW (-3,0)] -ńPath = P [mA (3.5,1.5), cR (0,-1) (-0.5,-1.5) (-1,-1.5), - aR 2.5 2.5 0 Large CCW (0,5), - cR (0.5,0) (1,-0.5) (1,-1.5)] +ńPath = nFree łPath = lFree ŕPath = rPart <> P [mA (5,0), lR (0,5)] @@ -679,12 +676,17 @@ dḿ = da <> P [mR (-4,-3), cR (-0.375,1.125) (-0.25,1.275) (-0.25,1.375), lR (0,-1), mR (0,1), aR 0.625 0.625 0 Small CCW (1.5,0), cR (0.125,-0.1) (0,-1.125) (-0.25,-1.375)] -dń = da <> P [mR (-3,-2.5), aR 1 1 0 Small CCW (0,2)] -dł = da <> P [mR (-1.5,-3.5), cR (-1.125,-0.375) (-1.275,-0.25) (-1.375,-0.25), - aR 0.625 0.625 0 Small CCW (0,1.5), - lR (1,0), mR (-1,0), - aR 0.625 0.625 0 Small CCW (0,1.5), - cR (0.1,0.125) (1.125,0) (1.375,-0.25)] +dń = da <> P [mR (-2,-2.5), + qR (0.25,-0.625) (-0.5,-0.5), + cR (-1.5,0.25) (-1.5,2.75) (0,2.5), + qR (0.375,-0.0625) (0.5,-0.3)] +dł = da <> + P [mR (-2,-2.75), + cR (0.125,-0.125) (0,-0.375) (-0.625,-0.25), + cR (-0.75,0.15) (-1,1.25) (0,1.25), + lR (0.375,0), mR (-0.625,0), + cR (-0.75,0.15) (-1,1.25) (0,1.25), + qR (1,0) (1.125,-0.375)] dŕ = da <> P [mR (-3,0), cR (1,0) (3,-1) (3,-2)] punctuation :: Map Text Glyph