improve some more glyphs

This commit is contained in:
Rhiannon Morris 2021-04-29 18:07:10 +02:00
parent 22ca63a5d2
commit 3fb71b64da

View file

@ -43,7 +43,7 @@ tGlyphs = [("t",t), ("tt",tt), ("tk",tk), ("tg",tg), ("td",td), ("tƶ",tƶ),
("tn",tn), ("tr",tr), ("",), ("",), ("tw",tw), ("th",th), ("tn",tn), ("tr",tr), ("",), ("",), ("tw",tw), ("th",th),
("tf",tf), ("tj",tj)] ("tf",tf), ("tj",tj)]
t = G {path = tPath, width = 5} t = G {path = tPath, width = 5.5}
tt = G {path = ttPath, width = 6} tt = G {path = ttPath, width = 6}
tk = G {path = tkPath, width = 9} tk = G {path = tkPath, width = 9}
tg = G {path = tgPath, width = 9} tg = G {path = tgPath, width = 9}
@ -65,7 +65,7 @@ tf = G {path = tfPath, width = 10}
tj = G {path = tjPath, width = 5} tj = G {path = tjPath, width = 5}
t0 = G {path = t0Path, width = 5} t0 = G {path = t0Path, width = 5}
tPath = P [mA (1.5,0), lR (0,5), mA (0,0), lR (5,0), lR (0,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)] 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), 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)] mA (0,0), lR (7,0), lR (0,5)]
@ -89,7 +89,6 @@ tfPath = tPart 4 <> shiftX 4 fPath
tjPath = P [mA (2,0), lR (0,5), mA (0,0), lR (4,0), mA (0,-3), tjPath = P [mA (2,0), lR (0,5), mA (0,0), lR (4,0), mA (0,-3),
lR (5,0), lR (0,8)] lR (5,0), lR (0,8)]
t0Path = tPath <> P [mA (1.5,7), cR (1.8,-0.25) (3.1,0) (3.5,0.5)] t0Path = tPath <> P [mA (1.5,7), cR (1.8,-0.25) (3.1,0) (3.5,0.5)]
-- t0Path = tPath <> P [mA (1.5,7), lR (3.5,0)] -- straight forme
kGlyphs = [("k", k), ("kk", kk), ("ks", ks)] kGlyphs = [("k", k), ("kk", kk), ("ks", ks)]
@ -168,7 +167,6 @@ dLong = dFree <> shiftX 1.5 dJoin
ƶfPath = dFree <> shiftX 4 fPath ƶfPath = dFree <> shiftX 4 fPath
ƶjPath = dFree <> shiftX 4 fPath ƶjPath = dFree <> shiftX 4 fPath
ƶ0Path = dFree <> P [mA (1,7), cR (1.8,-0.25) (2.2,0) (2.5,0.5)] ƶ0Path = dFree <> P [mA (1,7), cR (1.8,-0.25) (2.2,0) (2.5,0.5)]
-- ƶ0Path = dFree <> P [mA (1,7), lR (2.5,0)] -- straight forme
pGlyphs = [("p", p), ("pp", pp), ("ps", ps), ("pj", pj)] pGlyphs = [("p", p), ("pp", pp), ("ps", ps), ("pj", pj)]
@ -245,7 +243,6 @@ shPath = sPart <> shiftX 5 hPath
sfPath = sPart <> shiftX 4 fPath sfPath = sPart <> 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), 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)] mA (3,0), lR (3,0), lR (0,5), mA (3,2), lR (3,0)]
-- s0Path = sPath <> P [mA (1.5,7), lR (3,0)] -- straight
s0Path = sPath <> P [mA (1.5,7), cR (1.8,-0.25) (2.6,0) (3,0.5)] s0Path = sPath <> P [mA (1.5,7), cR (1.8,-0.25) (2.6,0) (3,0.5)]
@ -345,7 +342,6 @@ lwPath = lPart <> shiftX 5 wPath
lhPath = lPart <> shiftX 5 hPath lhPath = lPart <> shiftX 5 hPath
lfPath = lFree <> shiftX 5 fPath lfPath = lFree <> shiftX 5 fPath
ljPath = lPartFlat <> P [mA (4,0), lR (2,0), lR (0,5)] ljPath = lPartFlat <> P [mA (4,0), lR (2,0), lR (0,5)]
-- l0Path = lFree <> P [mA (0.75,7), lR (3,0)] -- straight
l0Path = lFree <> P [mA (1.25,7), cR (1.8,-0.25) (2.2,0) (2.5,0.5)] l0Path = lFree <> P [mA (1.25,7), cR (1.8,-0.25) (2.2,0) (2.5,0.5)]
@ -400,7 +396,6 @@ mwPath = mPart <> shiftX 6 wPath
mhPath = mPart <> shiftX 6 hPath mhPath = mPart <> shiftX 6 hPath
mfPath = ḿPath <> shiftX 7 fPath mfPath = ḿPath <> shiftX 7 fPath
mjPath = ḿPath <> P [mA (5.5,0), lR (3.5,0), lR (0,5)] mjPath = ḿPath <> P [mA (5.5,0), lR (3.5,0), lR (0,5)]
-- m0Path = ḿPath <> P [mA (1,7), lR (4.5,0)]
m0Path = ḿPath <> P [mA (1.25,7), cR (3.55,-0.3) (3.8,0) (4,0.5)] m0Path = ḿPath <> P [mA (1.25,7), cR (3.55,-0.3) (3.8,0) (4,0.5)]
@ -457,7 +452,6 @@ nwPath = nFlat <> P [mA (5,0), lR (2,0)] <> shiftX 5 wPath
nhPath = nFlat <> shiftX 5 hPath nhPath = nFlat <> shiftX 5 hPath
nfPath = ńPath <> shiftX 4.5 fPath nfPath = ńPath <> shiftX 4.5 fPath
njPath = ńPath <> P [mA (1,-3), lR (4,0), lR (0,8)] njPath = ńPath <> P [mA (1,-3), lR (4,0), lR (0,8)]
-- n0Path = ńPath <> P [mA (0.5,7), lR (3,0)]
n0Path = ńPath <> P [mA (1,7), cR (1.8,-0.25) (2.2,0) (2.5,0.5)] n0Path = ńPath <> P [mA (1,7), cR (1.8,-0.25) (2.2,0) (2.5,0.5)]
@ -515,7 +509,6 @@ rhPath = rMid <> shiftX 4.5 hPath
rfPath = rMid <> shiftX 4.5 fPath rfPath = rMid <> shiftX 4.5 fPath
rjPath = rMid <> P [mA (3.5,0), lR (4,0), lR (0,5)] rjPath = rMid <> P [mA (3.5,0), lR (4,0), lR (0,5)]
rMid = rPartMid <> P [mA (3.5,0), lR (0,5)] rMid = rPartMid <> P [mA (3.5,0), lR (0,5)]
-- r0Path = ŕPath <> P [mA (0.5,7), lR (4,0)]
r0Path = ŕPath <> P [mA (1.25,7), cR (2.2,-0.25) (2.8,0) (3,0.5)] r0Path = ŕPath <> P [mA (1.25,7), cR (2.2,-0.25) (2.8,0) (3,0.5)]
@ -529,7 +522,7 @@ r0Path = ŕPath <> P [mA (1.25,7), cR (2.2,-0.25) (2.8,0) (3,0.5)]
čPart = P [mA (0,0.5), cR (2.25,-0.75) (2.55,-0.5) (2.75,-0.5)] <> čPart' čPart = P [mA (0,0.5), cR (2.25,-0.75) (2.55,-0.5) (2.75,-0.5)] <> čPart'
čPart' = P [aR 1.25 1.25 0 Small CW (0,2.5), lR (-2,0), mR (2,0), čPart' = P [aR 1.25 1.25 0 Small CW (0,2.5), lR (-2,0), mR (2,0),
aR 1.25 1.25 0 Small CW (0,2.5), aR 1.25 1.25 0 Small CW (0,2.5),
cR (-0.2,0.25) (-2.25,0) (-2.75,-0.5)] -- FIXME? cR (-0.2,0.25) (-2.25,0) (-2.75,-0.5)]
čJoin = P [mA (2.5,5), cR (1.5,0) (2.5,-0.5) (2.5,-1)] čJoin = P [mA (2.5,5), cR (1.5,0) (2.5,-0.5) (2.5,-1)]
čPartFlat = P [mA (0,0), lR (3.5,0)] <> čPart' čPartFlat = P [mA (0,0), lR (3.5,0)] <> čPart'
čFlat = čPartFlat <> shiftX 1 čJoin <> P [mA (6,0), lR (0,5)] čFlat = čPartFlat <> shiftX 1 čJoin <> P [mA (6,0), lR (0,5)]
@ -551,8 +544,8 @@ r0Path = ŕPath <> P [mA (1.25,7), cR (2.2,-0.25) (2.8,0) (3,0.5)]
w = G {path = wPath, width = 6} w = G {path = wPath, width = 6}
wPath = wPart <> P [mA (6,0), lR (0,5)] wPath = wPart <> shiftX 5.75 aPath
wPart = P $ circA 2.5 (2.5,2.5) <> [mA (2.5,0), lR (3.5,0)] wPart = uPath <> P [mA (2.5,0), lR (3.5,0)]
hGlyphs = [("h", h), ("hh", hh), ("hn", hn), ("hm", hm)] hGlyphs = [("h", h), ("hh", hh), ("hn", hn), ("hm", hm)]
@ -583,43 +576,46 @@ fPart = P [mA (3.5,2.5), lR (-1, 0), lR (0,2.5),
aR 2.5 2.5 0 Small CW (2.5, 2.5)] aR 2.5 2.5 0 Small CW (2.5, 2.5)]
fnPath = fPath <> shiftX 7 nPath fnPath = fPath <> shiftX 7 nPath
fmPath = fPart <> P [lR (0,1)] <> mBump <> mBump' <> P [mA (12,0), lR (0,5)] fmPath = fPart <> P [lR (0,1)] <> mBump <> mBump' <> P [mA (12,0), lR (0,5)]
-- f0Path = fPath <> P [mA (0.5,7), lR (5,0)]
f0Path = fPath <> P [mA (1.5,7), cR (2.8,-0.35) (3.1,0) (3.5,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 = 5}
jPath = P [mA (0,0), lR (5,0), lR (0,5)] jPath = P [mA (0,0), lR (5,0)] <> shiftX 4.75 aPath
vGlyphs = [("a", a), ("á", á), ("i", i), ("í", í), ("u", u), ("ú", ú), vGlyphs = [("a", a), ("á", á), ("i", i), ("í", í), ("u", u), ("ú", ú),
("ai", ai), ("au", au), ("ia", ia), ("ua", ua), ("ḿ", ḿ), ("ai", ai), ("au", au), ("ia", ia), ("ua", ua), ("ḿ", ḿ),
("ń", ń), ("ł", ł), ("ŕ", ŕ)] ("ń", ń), ("ł", ł), ("ŕ", ŕ)]
a = G {path = aPath, width = 0} a = G {path = aPath, width = 0.125}
á = G {path = áPath, width = 3} á = G {path = áPath, width = 2.125}
i = j i = j
í = G {path = íPath, width = 5} í = G {path = íPath, width = 5}
u = G {path = uPath, width = 5} u = G {path = uPath, width = 4.5}
ú = G {path = úPath, width = 6} ú = G {path = úPath, width = 4}
ai = G {path = aiPath, width = 5} ai = G {path = aiPath, width = 5}
au = G {path = auPath, width = 5} au = G {path = auPath, width = 4.5}
ia = G {path = iaPath, width = 5} ia = G {path = iaPath, width = 5}
ua = G {path = uaPath, width = 5} ua = G {path = uaPath, width = 4.5}
ḿ = G {path = ḿPath, width = 6} ḿ = G {path = ḿPath, width = 6}
ń = G {path = ńPath, width = 3} ń = G {path = ńPath, width = 3}
ł = G {path = łPath, width = 4} ł = G {path = łPath, width = 4}
ŕ = G {path = ŕPath, width = 5} ŕ = G {path = ŕPath, width = 5}
aPath = P [mA (0,0), lR (0,5)] aPath = P [mA (0.25,0), cR (-0.25,1) (-0.25,2) (-0.25,5)]
áPath = P [mA (0,0), lR (0,5), mA (3,0), lR (0,5)] áPath = aPath <> shiftX 2 aPath
íPath = P [mA (0,0), lR (3,0), lR (0,5), mR (0,-5), lR (2,0), lR (0,5)] íPath = P [mA (0,0), lR (5,0)] <> shiftX 2.75 aPath <> shiftX 4.75 aPath
uPath = P $ circA 2.5 (2.5,2.5) uPath = P [mA (2.25,0),
úPath = P $ ellipseA 1.5 2.5 (1.5,2.5) <> ellipseA 1.5 2.5 (4.5,2.5) cR (-3.2,0.5) (-3.2,5.5) (0,5),
aiPath = P [mA (0,0), lR (0,5), mR (2,-5), lR (3,0), lR (0,5)] cR (3.2,-0.5) (3.2,-5.5) (0,-5)]
auPath = P $ uNarrow = P [mA (1.5,0),
[mA (0,0), lR (0,5)] <> ellipseA 1.5 2.5 (3.5,2.5) cR (-2.2,0.25) (-2.2,5.25) (0,5),
iaPath = P [mA (0,0), lR (3,0), lR (0,5), mA (5,0), lR (0,5)] cR (2.2,-0.25) (2.2,-5.25) (0,-5)]
uaPath = P $ ellipseA 1.5 2.5 (1.5,2.5) <> [mA (5,0), lR (0,5)] úPath = uPath <> P [mA (4.25,-3), cR (-1.5,3) (-3.2,8) (-2.8,12)]
aiPath = aPath <> P [mR (2,-5), lR (3,0)] <> shiftX 4.75 aPath
auPath = aPath <> shiftX 1.5 uNarrow
iaPath = P [mA (0,0), lR (3,0)] <> shiftX 2.75 aPath <> shiftX 5 aPath
uaPath = uNarrow <> shiftX 4.5 aPath
ḿPath = P [mA (0.5,0), cR (-0.25,0.2) (-0.5,2.25) (-0.5,3.5), ḿPath = P [mA (0.5,0), cR (-0.25,0.2) (-0.5,2.25) (-0.5,3.5),
aR 1.5 1.5 0 Small CCW (3,0), lR (0,-2), 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), mA (5.5,0), cR (0.25,0.2) (0.5,2.25) (0.5,3.5),
@ -641,7 +637,10 @@ du = da <> P [lR (-4,0)]
= du <> P [mR (4,-3), lR (-3,0)] = du <> P [mR (4,-3), lR (-3,0)]
dai = da <> P [mR (-4,-3), lR (2.5,0), lR (0,3)] dai = da <> P [mR (-4,-3), lR (2.5,0), lR (0,3)]
dau = da <> P (circR 1.5 (-3,-2)) <> P [mR (1.5,-1.5), lR (3,0)] dau = da <> P [mR (-3,-3.5),
cR (-1.5,0.25) (-1.5,3.25) (0,3),
cR (1.5,-0.25) (1.5,-3.25) (0,-3),
cR (1,-0.25) (2,0.5) (3,0)]
dia = di <> adot (-1.5,0) dia = di <> adot (-1.5,0)
dua = du <> adot (2,-2) dua = du <> adot (2,-2)