diff --git a/laantas-script/Glyphs.hs b/laantas-script/Glyphs.hs index d2be880..78fc504 100644 --- a/laantas-script/Glyphs.hs +++ b/laantas-script/Glyphs.hs @@ -373,7 +373,7 @@ mGlyphs = [("m",m), ("mt",mt), ("mk",mk), ("mg",mg), ("md",md), ("mƶ",mƶ), ("mn",mn), ("mr",mr), ("mč",mč), ("mǧ",mǧ), ("mw",mw), ("mh",mh), ("mf",mf), ("mj",mj)] -m = simpleG mPath 6 +m = simpleG mPath 6.125 mt = simpleG mtPath 10 mk = simpleG mkPath 10 mg = simpleG mgPath 10 @@ -395,31 +395,36 @@ mf = simpleG mfPath 13 mj = simpleG mjPath 9 m0 = simpleG m0Path 6 -mPath = mPart <> P [mA (6,0), lR (0,5)] +mPath = mPart <> shiftX 6 aPath 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 = mBump' <> P [lR (0,-2), mR (0,2)] -mPart = mInit <> mBump <> mBump' +mBumpI = P [cR (0,2) (2.5,2) (3,0)] <> mLine +mLine = P [qR (0.125,-1) (0.125,-2), mR (-0.125,2)] +mBumpF = P [cR (-0.5,2) (2.5,2) (3,0)] +mBumpM = mBumpF <> mLine +mBumpsN n = mconcat $ [mBumpI] <> replicate n mBumpM <> [mBumpF] +mBumps = mBumpsN 0 +mPart = mInit <> mBumps +mFree = mPart <> P [cR (0.5,-2) (-0.75,-4) (-1.5,-3.5)] mtPath = mPart <> shiftX 4.5 tPath mkPath = mPart <> shiftX 6 kShort mgPath = mPart <> shiftX 6 gShort -mdPath = ḿPath <> shiftX 7 dPath -mƶPath = ḿPath <> shiftX 7 ƶPath -mpPath = ḿPath <> shiftX 7 pPath +mdPath = mFree <> shiftX 7 dPath +mƶPath = mFree <> shiftX 7 ƶPath +mpPath = mFree <> shiftX 7 pPath mbPath = mPart <> shiftX 6 bPath msPath = mPart <> shiftX 6 sPath mšPath = mPart <> shiftX 6 šPath mlPath = mPart <> shiftX 6 lPath -mmPath = mInit <> mBump <> mBump <> mBump <> mBump' <> P [mR (0,-3.5), lR (0,5)] +mmPath = mInit <> mBumpsN 2 <> P [mR (0,-3.5), lR (0,5)] mnPath = mPart <> shiftX 6 nPath -mrPath = mInit <> mBump <> mBump <> mBump' <> P [mR (0,-6.5), lR (0,8)] -mčPath = ḿPath <> shiftX 7 čPath -mǧPath = ḿPath <> shiftX 7 ǧPath +mrPath = mInit <> mBumpsN 1 <> P [mR (0,-6.5), lR (0,8)] +mčPath = mFree <> shiftX 7 čPath +mǧPath = mFree <> shiftX 7 ǧPath 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 (1.25,7), cR (3.55,-0.3) (3.8,0) (4,0.5)] +mfPath = mFree <> shiftX 7 fPath +mjPath = mFree <> P [mA (5.5,0), lR (3.5,0), lR (0,5)] +m0Path = mFree <> 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ƶ), @@ -603,7 +608,7 @@ fPart = P [mA (4.25,2.5), cR (1.6,-0.25) (2.5,1) (2.5,3) ] 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)] <> mBumps <> 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 = simpleG jPath 4 @@ -646,10 +651,7 @@ 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), - 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 = mFree ńPath = nFree łPath = lFree ŕPath = rPart <> P [mA (5,0), lR (0,5)]