From c1c5b787d87dbd08139ef3e218c48e2367e8c905 Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Thu, 29 Apr 2021 12:17:19 +0200 Subject: [PATCH] improve virama lines --- laantas-script/Glyphs.hs | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/laantas-script/Glyphs.hs b/laantas-script/Glyphs.hs index 47cbfa0..255a6cb 100644 --- a/laantas-script/Glyphs.hs +++ b/laantas-script/Glyphs.hs @@ -88,7 +88,8 @@ 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)] -t0Path = tPath <> P [mA (1.5,7), lR (3.5,0)] +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)] @@ -166,7 +167,8 @@ dLong = dFree <> shiftX 1.5 dJoin ƶhPath = dPart <> shiftX 5 hPath ƶfPath = dFree <> shiftX 4 fPath ƶjPath = dFree <> shiftX 4 fPath -ƶ0Path = dFree <> P [mA (0,7), lR (3.5,0)] +ƶ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)] @@ -243,7 +245,8 @@ shPath = sPart <> shiftX 5 hPath 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), mA (3,0), lR (3,0), lR (0,5), mA (3,2), lR (3,0)] -s0Path = sPath <> P [mA (0.5,7), lR (4,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)] šGlyphs = [("š",š), ("št",št), ("šk",šk), ("šg",šg), ("šd",šd), ("šƶ",šƶ), @@ -342,7 +345,8 @@ lwPath = lPart <> shiftX 5 wPath lhPath = lPart <> shiftX 5 hPath lfPath = lFree <> shiftX 5 fPath ljPath = lPartFlat <> P [mA (4,0), lR (2,0), lR (0,5)] -l0Path = lFree <> P [mA (0.25,7), lR (3.5,0)] +-- 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)] mGlyphs = [("m",m), ("mt",mt), ("mk",mk), ("mg",mg), ("md",md), ("mƶ",mƶ), @@ -396,7 +400,8 @@ mwPath = mPart <> shiftX 6 wPath mhPath = mPart <> shiftX 6 hPath mfPath = ḿPath <> shiftX 7 fPath mjPath = ḿPath <> P [mA (5.5,0), lR (3.5,0), lR (0,5)] -m0Path = ḿPath <> P [mA (0.5,7), lR (5,0)] +-- 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)] nGlyphs = [("n", n), ("nt", nt), ("nk", nk), ("ng", ng), ("nd", nd), ("nƶ", nƶ), @@ -452,7 +457,8 @@ 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 (0.5,7), lR (3,0)] +-- 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)] rGlyphs = [("r", r), ("rt", rt), ("rk", rk), ("rg", rg), ("rd", rd), ("rƶ", rƶ), @@ -509,7 +515,8 @@ rhPath = rMid <> shiftX 4.5 hPath rfPath = rMid <> shiftX 4.5 fPath rjPath = rMid <> P [mA (3.5,0), lR (4,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 (0.5,7), lR (4,0)] +r0Path = ŕPath <> P [mA (1.25,7), cR (2.2,-0.25) (2.8,0) (3,0.5)] čGlyphs = [("č", č), ("čs", čs), ("čč", čč)] @@ -576,7 +583,8 @@ 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)] fnPath = fPath <> shiftX 7 nPath 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 (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)] j = G {path = jPath, width = 5} @@ -607,10 +615,9 @@ aPath = P [mA (0,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) úPath = P $ ellipseA 1.5 2.5 (1.5,2.5) <> ellipseA 1.5 2.5 (4.5,2.5) -aiPath = P [mA (0,0), lR (0,5), mR (2,-5), lR (3,0), lR (0,5), - mA (2.5,7), lR (2,0)] +aiPath = P [mA (0,0), lR (0,5), mR (2,-5), lR (3,0), lR (0,5)] auPath = P $ - [mA (0,0), lR (0,5)] <> ellipseA 1.5 2.5 (3.5,2.5) <> [mA (2.5,7), lR (2,0)] + [mA (0,0), lR (0,5)] <> ellipseA 1.5 2.5 (3.5,2.5) iaPath = P [mA (0,0), lR (3,0), lR (0,5), mA (5,0), lR (0,5)] uaPath = P $ ellipseA 1.5 2.5 (1.5,2.5) <> [mA (5,0), lR (0,5)] ḿPath = P [mA (0.5,0), cR (-0.25,0.2) (-0.5,2.25) (-0.5,3.5),