rhi/lang
1
0
Fork 0
Code Issues 2 Pull requests Releases Wiki Activity

fix missing letters + other errors

Browse source
This commit is contained in:
Rhiannon Morris 2021-04-29 12:01:16 +02:00
parent f61e5b1146
commit 2607e26119
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
laantas-script/Glyphs.hs
View file

@ -229,7 +229,7 @@ sgPath = sPartLine <> shiftX 5 gShort
sdPath = sPart <> P [mA (3,0), lR (1,0)] <> shiftX 4 dPath 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 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 <> P [mA (3,0), lR (3.5,0)] <> shiftX 5 pPath
sbPath = sPart <> shiftX 4 bPath <> P [mA (3,0), lR (0,-3), lR (3.5,0)] sbPath = sPart <> shiftX 4 bPath <> P [mA (3,0), lR (0,-3), lR (3.5,0), mA (10,5)]
ssPath = sPartLine <> shiftX 5 sPath ssPath = sPartLine <> shiftX 5 sPath
sšPath = sPartLine <> shiftX 5 šPath sšPath = sPartLine <> shiftX 5 šPath
slPath = sPart <> P [mA (3,0), lR (3,0)] <> shiftX 5 lPath slPath = sPart <> P [mA (3,0), lR (3,0)] <> shiftX 5 lPath
@ -275,18 +275,20 @@ s0Path = sPath <> P [mA (0.5,7), lR (4,0)]
šPath = sPath <> šLine <> P [mA (5,5)] šPath = sPath <> šLine <> P [mA (5,5)]
šLine = P [mA (0.5,-1.5), lR (2,0)] šLine = P [mA (0.5,-1.5), lR (2,0)]
ššPath = ssPath <> P [mA (1,-2), lR (7,0)] ššPath = ssPath <> P [mA (1,-2), lR (7,0), mA (10,5)]
špPath = spPath <> P [mA (0,-3), lR (3,0)] špPath = spPath <> P [mA (0,-3), lR (3,0)]
šbPath = sPart <> šLine <> P [mA (3,0), lR (4,0)] <> shiftX 4 bPath šbPath = sPart <> šLine <> P [mA (3,0), lR (4,0)] <> shiftX 4 bPath
s2š g@(G {path}) = g {path = path <> šLine} s2š g@(G {path, width}) =
g {path = path <> šLine <> P [mA (width,5)]}
lGlyphs = [("l",l), ("lt",lt), ("lk",lk), ("lg",lg), ("ld",ld), ("lƶ",lƶ), lGlyphs = [("l",l), ("ll", ll), ("lt",lt), ("lk",lk), ("lg",lg), ("ld",ld),
("lp",lp), ("lb",lb), ("ls",ls), ("lš",lš), ("lm",lm), ("ln",ln), ("lƶ",lƶ), ("lp",lp), ("lb",lb), ("ls",ls), ("lš",lš), ("lm",lm),
("lr",lr), ("lč",lč), ("lǧ",lǧ), ("lw",lw), ("lh",lh), ("lf",lf), ("ln",ln), ("lr",lr), ("lč",lč), ("lǧ",lǧ), ("lw",lw), ("lh",lh),
("lj",lj)] ("lf",lf), ("lj",lj)]
l = G {path = lPath, width = 5} l = G {path = lPath, width = 5}
ll = G {path = llPath, width = 10}
lt = G {path = ltPath, width = 10} lt = G {path = ltPath, width = 10}
lk = G {path = lkPath, width = 9} lk = G {path = lkPath, width = 9}
lg = G {path = lgPath, width = 9} lg = G {path = lgPath, width = 9}
@ -321,6 +323,7 @@ lFree = P [mA (4,0.5), cR (-2.25,-0.75) (-2.55,-0.5) (-2.75,-0.5),
aR 1.25 1.25 0 Small CCW (0,2.5), aR 1.25 1.25 0 Small CCW (0,2.5),
cR (0.2,0.25) (2.25,0) (2.75,-0.5)] cR (0.2,0.25) (2.25,0) (2.75,-0.5)]
lLong = lBase <> P [mA (2,5), lR (2,0)] <> shiftX 1.5 dJoin lLong = lBase <> P [mA (2,5), lR (2,0)] <> shiftX 1.5 dJoin
llPath = lPart <> shiftX 5 lPath
ltPath = lLong <> shiftX 5 tPath ltPath = lLong <> shiftX 5 tPath
lkPath = lPart <> shiftX 5 kShort lkPath = lPart <> shiftX 5 kShort
lgPath = lPart <> shiftX 5 gShort lgPath = lPart <> shiftX 5 gShort
@ -348,7 +351,7 @@ mGlyphs = [("m",m), ("mt",mt), ("mk",mk), ("mg",mg), ("md",md), ("mƶ",mƶ),
("mf",mf), ("mj",mj)] ("mf",mf), ("mj",mj)]
m = G {path = mPath, width = 6} m = G {path = mPath, width = 6}
mt = G {path = mtPath, width = 10} mt = G {path = mtPath, width = 9.5}
mk = G {path = mkPath, width = 10} mk = G {path = mkPath, width = 10}
mg = G {path = mgPath, width = 10} mg = G {path = mgPath, width = 10}
md = G {path = mdPath, width = 12} md = G {path = mdPath, width = 12}
@ -374,8 +377,7 @@ mInit = P [mA (0.5,0), cR (-0.25,0.2) (-0.5,2.25) (-0.5,3.5)]
mBump' = P [aR 1.5 1.5 0 Small CCW (3,0)] mBump' = P [aR 1.5 1.5 0 Small CCW (3,0)]
mBump = mBump' <> P [lR (0,-2), mR (0,2)] mBump = mBump' <> P [lR (0,-2), mR (0,2)]
mPart = mInit <> mBump <> mBump' mPart = mInit <> mBump <> mBump'
mLong = mInit <> mBump <> mBump' <> P [cR (2,0) (2,-1) (2,-2)] mtPath = mPart <> shiftX 4.5 tPath
mtPath = mLong <> shiftX 5 tPath
mkPath = mPart <> shiftX 6 kShort mkPath = mPart <> shiftX 6 kShort
mgPath = mPart <> shiftX 6 gShort mgPath = mPart <> shiftX 6 gShort
mdPath = ḿPath <> shiftX 7 dPath mdPath = ḿPath <> shiftX 7 dPath
@ -455,8 +457,8 @@ n0Path = ńPath <> P [mA (0.5,7), lR (3,0)]
rGlyphs = [("r", r), ("rt", rt), ("rk", rk), ("rg", rg), ("rd", rd), ("rƶ", rƶ), rGlyphs = [("r", r), ("rt", rt), ("rk", rk), ("rg", rg), ("rd", rd), ("rƶ", rƶ),
("rp", rp), ("rb", rb), ("rs", rs), ("rš", rš), ("rl", rl), ("rp", rp), ("rb", rb), ("rs", rs), ("rš", rš), ("rl", rl),
("rm", rm), ("rr", rr), ("rč", rč), ("rǧ", rǧ), ("rw", rw), ("rm", rm), ("rn", rn), ("rr", rr), ("rč", rč), ("rǧ", rǧ),
("rh", rh), ("rf", rf), ("rj", rj)] ("rw", rw), ("rh", rh), ("rf", rf), ("rj", rj)]
r = G {path = rPath, width = 5} r = G {path = rPath, width = 5}
rt = G {path = rtPath, width = 7} rt = G {path = rtPath, width = 7}
@ -471,6 +473,7 @@ rš = G {path = ršPath, width = 9.5}
rl = G {path = rlPath, width = 9.5} rl = G {path = rlPath, width = 9.5}
rm = G {path = rmPath, width = 10.5} rm = G {path = rmPath, width = 10.5}
rr = G {path = rrPath, width = 6} rr = G {path = rrPath, width = 6}
rn = G {path = rnPath, width = 9}
rč = G {path = rčPath, width = 9.5} rč = G {path = rčPath, width = 9.5}
rǧ = G {path = rǧPath, width = 9.5} rǧ = G {path = rǧPath, width = 9.5}
rw = G {path = rwPath, width = 10.5} rw = G {path = rwPath, width = 10.5}
@ -497,6 +500,7 @@ rsPath = rMid <> shiftX 4.5 sPath
ršPath = rMid <> shiftX 4.5 šPath ršPath = rMid <> shiftX 4.5 šPath
rlPath = rMid <> shiftX 4.5 lPath rlPath = rMid <> shiftX 4.5 lPath
rmPath = rMid <> shiftX 4.5 mPath rmPath = rMid <> shiftX 4.5 mPath
rnPath = rShort <> shiftX 4 nPath
rrPath = rShort <> shiftX 3 rShort rrPath = rShort <> shiftX 3 rShort
rčPath = rMid <> shiftX 4.5 čPath rčPath = rMid <> shiftX 4.5 čPath
rǧPath = rMid <> shiftX 4.5 ǧPath rǧPath = rMid <> shiftX 4.5 ǧPath
@ -598,7 +602,7 @@ ua = G {path = uaPath, width = 5}
ł = 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 (5,0)] aPath = P [mA (0,0), lR (0,5)]
áPath = P [mA (0,0), lR (5,0), mA (3,0), lR (5,0)] áPath = P [mA (0,0), lR (5,0), mA (3,0), lR (5,0)]
í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 (3,0), lR (0,5), mR (0,-5), lR (2,0), lR (0,5)]
uPath = P $ circA 2.5 (2.5,2.5) uPath = P $ circA 2.5 (2.5,2.5)
@ -630,7 +634,7 @@ du = da <> P [lR (-4,0)]
dú = du <> P [mR (4,-3), lR (-3,0)] dú = 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 (-2,-2)) <> P [mR (-1,0), lR (2,0)] dau = da <> P (circR 1.5 (-3,-2)) <> P [mR (1.5,-1.5), lR (3,0)]
dia = di <> adot (-1.5,0) dia = di <> adot (-1.5,0)
dua = du <> adot (2,-2) dua = du <> adot (2,-2)
@ -657,7 +661,7 @@ eosPath = P $ circA 1 (1,1) <> circA 1 (1,4)
eop = G {path = eopPath, width = -2} eop = G {path = eopPath, width = -2}
eopPath = P $ circA 1 (-1,2.5) eopPath = P $ circA 1 (-1,2.5)
num = G {path = P [mA (0,0), lR (0,5)], width = 0} num = G {path = P [mA (0,0), lR (0,5), mA (1,0), lR (0,5)], width = 1}
numbers = Map.fromList $ numbers = Map.fromList $
zip [0..9::Int] [u, t, n2, G dFree 3, n4, n5, ł, ḿ, ń, f] zip [0..9::Int] [u, t, n2, G dFree 3, n4, n5, ł, ḿ, ń, f]
@ -666,8 +670,8 @@ n2Path = P [mA (0,0), lR (0,5), sR (3,0) (5,-0.5), mA (5,0), lR (0,5)]
n4 = G n4Path 5 n4 = G n4Path 5
n4Path = P [mA (1.5,0), lR (0,5), sR (-1.5,-3) (-1.5,-5), lR (5,0), lR (0,5)] n4Path = P [mA (1.5,0), lR (0,5), sR (-1.5,-3) (-1.5,-5), lR (5,0), lR (0,5)]
n5 = G n5Path 4 n5 = G n5Path 4
n5Path = P [mA (0,0), lR (0,3.5), aR 1.5 1.5 0 Small CCW (1.5,1.5), n5Path = P [mA (0,5), lR (0,-3.5), aR 1.5 1.5 0 Small CW (1.5,-1.5),
lR (1,0), aR 1.5 1.5 0 Small CCW (1.5,-1.5), lR (0,-3.5)] lR (1,0), aR 1.5 1.5 0 Small CW (1.5,1.5), lR (0,3.5)]
wave :: Glyph wave :: Glyph
wave = G {path = wavePath, width = 4} where wave = G {path = wavePath, width = 4} where