X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-toevallig.mf;h=9616c63d75fa1f4f3d444b17e7890053c0aa576a;hb=7979d8adaa8393daefd6585534221a93dd526758;hp=1238eb366b9e0a4ac44f95df18f9c6081a86824f;hpb=460999e232e2126654185e5f5675f72cea495b13;p=lilypond.git diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf index 1238eb366b..9616c63d75 100644 --- a/mf/feta-toevallig.mf +++ b/mf/feta-toevallig.mf @@ -1,3 +1,12 @@ +% +% feta-toevallig.mf -- implement Accidentals +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997--2003 Han-Wen Nienhuys +% + + % % Accidentals from various sources, notably % @@ -12,19 +21,25 @@ fet_begingroup("accidentals"); +% +% The beams of most sharps have horizontal endings (as if drawn with +% a square pen). [Wanske] does not mention this, so we'll just ignore +% this fact +% fet_beginchar("Sharp" , "1", "sharp"); - set_char_box(0, 1.1 interline#, 1.5 interline#, - 1.5 interline#); + set_char_box(0, 1.1 staff_space#, 1.5 staff_space#, + 1.5 staff_space#); save interbeam, interstem, beamheight, beamwidth, - stemwidth; + stemwidth, beamslope; - interbeam := 1.05 interline; + interbeam := 1.05 staff_space; interstem := 7/16 ; beamheight := 4 stafflinethickness; beamwidth := w; - stemwidth := 1.3 stafflinethickness; - roundness := blot_diameter; + stemwidth := 1.5 stafflinethickness; + roundness := 2 blot_diameter; + pair center; center := (.5 w, 0); @@ -50,30 +65,52 @@ fet_beginchar("Sharp" , "1", "sharp"); + vspan -- -hspan -vspan -- hspan - vspan -- cycle ) shifted center; - draw_rounded_path((beam shifted (0,-interbeam/2)), roundness); - draw_rounded_path((beam shifted (0,interbeam/2)), roundness); + pickup pencircle scaled roundness; + filldraw (beam shifted (0,-interbeam/2)); pickup pencircle scaled stemwidth; x3 = x4 = xpart center; - bot y3 = -1.5 interline + ypart center; - top y4 = 1.5 interline + ypart center; - path stem; - stem := z3 .. z4; numeric xs; xs := interstem* beamwidth / 2; - draw stem shifted (- xs, - xs* beamslope); - draw stem shifted (xs , xs *beamslope); + + (bot y3) + -xs * beamslope = -1.5 staff_space + ypart center; + top y4 + xs * beamslope = 1.5 staff_space + ypart center; + + draw_gridline (z3-(xs,xs* beamslope),z4-(xs,xs*beamslope),stemwidth); + addto currentpicture also currentpicture rotated 180 shifted (w,0); labels(1,2,3,4); + + +% to check that it doesn't overshoot staffline. +% +% pickup pencircle scaled stafflinethickness; +% draw (0, 1.5 staff_space ) .. (1 staff_space, 1.5 staff_space); + fet_endchar; -fet_beginchar( "Natural", "0", "natural") - set_char_box(0, 8/12 interline#, 1.5 interline#, 1.5 interline#); +% +% The stems of the natural are brushed (at least, in Barenreiter SCS ) +% +% + +fet_beginchar( "Natural", "0", "natural") + save height, xcenter; save interbeam, interstem, beamheight, beamwidth, - stemwidth; + stemwidth; + save top_stem_thick; + + beamheight# = 4.0 stafflinethickness#; + height# = 1.5 staff_space#; + set_char_box(0, 2/3 staff_space#, height#, height#); + + define_pixels(height); + define_blacker_pixels(beamheight); + + % perhaps we should have a lowres fix? + top_stem_thick = 1.9 stafflinethickness; - beamheight = 4.5 stafflinethickness; interstem + stemwidth = w; stemwidth = 1.3 stafflinethickness; @@ -83,23 +120,38 @@ fet_beginchar( "Natural", "0", "natural") pickup penrazor scaled beamheight rotated 90; - top y2 = interline - 3/2 stafflinethickness ; - slope = stafflinethickness / interstem; + top y2 = staff_space - 3/2 stafflinethickness ; + slope = stafflinethickness / interstem; draw z1 .. z2; draw (xpart z1, -y2) .. (xpart z2, -y1); beamtop = top y2; - + pickup pencircle scaled stemwidth; - xpart z3 = xpart z1; - xpart z4 = xpart z2; - top y3 = 1.5 interline; + x3 := round (xpart z1); + x4 := round (xpart z2); + + penpos3(top_stem_thick, 0); + penpos5(top_stem_thick, 0); + penpos4(stemwidth, 0); + penpos6(stemwidth, 0); + + y3 = height; top y4 = beamtop; - draw (xpart z1, -y4) .. z3; - draw (xpart z2, -y3) .. z4; + x5 = x4; + x6 = x3; + bot y6 = -beamtop; + y5 = - height; - labels(1,2,3,4); + fill simple_serif (z3l, z3r, -30) -- simple_serif(z6r, z6l, -90) -- cycle; + fill simple_serif (z5l, z5r, 30) -- simple_serif(z4r, z4l, 90) -- cycle; + + + + penlabels(3,4,5,6); + + labels(1,2); fet_endchar; @@ -111,21 +163,40 @@ fet_beginchar( "Natural", "0", "natural") % % TODO: remove crook_fatness +% TODO: document, simplify! +% def draw_meta_flat(expr xcenter, w, crook_fatness) = clearxy; save crook_thinness; - save top_stem_thick, bottom_stem_thick, hair; + save bottom_overshoot; + save top_stem_thick, bottom_stem_thick, hair, smaller_hole; + save zwiep; save center; pair center; + save clearing; center = (xcenter, 0); - crook_thinness = 1.25 stafflinethickness; - top_stem_thick = 2 stafflinethickness; +% the shouldn't reach to the top staff line. +%% TODO: should take from height. + clearing = 1.2 stafflinethickness; + +% +% TODO: parameterize this +% + if w >= 0.75 staff_space: + smaller_hole = 0.2 stafflinethickness; + else: + smaller_hole = 0.0 stafflinethickness; + fi + crook_thinness = 1.1 stafflinethickness; + top_stem_thick = 2.2 stafflinethickness; + bottom_overshoot = stafflinethickness; bottom_stem_thick = 1.2 stafflinethickness; - z1 = (0, 2 interline) + center; - z2 = (0, - 1/2 interline)+ center; + z1 = (0, 2 staff_space) + center - (0, stafflinethickness/2 + + clearing); + z2 = (0, - 1/2 staff_space - stafflinethickness/2 )+ center; penpos1(top_stem_thick, 0); penpos2(bottom_stem_thick, 0); @@ -133,55 +204,54 @@ def draw_meta_flat(expr xcenter, w, crook_fatness) = fill simple_serif(z1r, z1l, 30) -- z2l -- z2r -- cycle; - y3l = (interline - stafflinethickness)/2 + ypart center; + y3l = (staff_space - stafflinethickness) / 2 + ypart center; z3l = whatever [z2r,z1r]; - z3r = .26 [z2r, z1r]; + z3r = .3 [z2r, z1r] + (smaller_hole, 0); + z10 = whatever [z2r, z1r] + (smaller_hole , 0); + z11 = center + (bottom_overshoot/3, + -staff_space/2 - stafflinethickness/2) - (0,bottom_overshoot); - z4 = (3/8 interline, interline/2) + center; penpos4(whatever, 53); - y4l - y4r = 2 crook_thinness ; -% y4l - y4r = 6/20[crook_thinness, crook_fatness] ; + y4l - y4r = 1.5 crook_thinness ; - y5r = 1/4 interline + ypart center; + y5r = .20 staff_space + ypart center; x5l = w + xpart center; - penpos5(crook_fatness, -175); - - z8 = (0, - interline/2 - stafflinethickness/2) + center; + y4 = ypart center + staff_space/2; + x4r = .45 [x5r, x3r]; - z9 = (x5,0); + penpos5(crook_fatness, -185); - save ne_angle; - ne_angle = angle(z9 - z8); + save bot_crook_dir ; + pair bot_crook_dir ; + bot_crook_dir = unitvector ((x5l,0) - z11); + z8 = z11 + whatever * bot_crook_dir; + y8 = - staff_space /2 +0.0* stafflinethickness; - z7 = 8/33 [z8,z9]; - z6l = 18/33 [z8,z9] + .5 crook_thinness *dir(ne_angle -90); - - penpos7(crook_thinness, ne_angle + 90); + z7 = z8 + whatever * bot_crook_dir + crook_thinness * (bot_crook_dir rotated 90); - z6r = .3 (z9-z8) + z7r; + x7 = .5 [x11, x8]; -% penpos7(crook_thinness, angle(dir(z8-center) -180); - - penpos8(whatever, ne_angle + 90); - x8r = xpart center - bottom_stem_thick/2; penlabels(range 0 thru 10); - z10 = (bottom_stem_thick/2, -1/5 interline) + center; + y10 = -1/5 staff_space; +% draw_staff (-2, 2, 0.5); +% draw_staff (-2, 2, 0.0); + + unfill z3r{z3r-z10} .. z4r{right} .. z5r{down} - unfill z3r{up} .. z4r{right} .. tension .9 - .. z6r --- - z7r{left} - .. z10 {up} -- cycle; - fill z8r{down} - .. tension 0.8 ..z8l{(z9-z8)} - .. z7l - .. z6l + .. z7{- bot_crook_dir} + & z7 .. tension 1.3 + .. z10{z3r-z10} -- cycle; + fill z2l{down} + + .. z11{right} + .. z8{bot_crook_dir} .. z5l{up} .. z4l{left} .. z3l -- cycle; - labels(10); + labels(11); enddef; @@ -189,28 +259,28 @@ enddef; % unfortunately, 600dpi is not enough to show the brush of the stem. % fet_beginchar("Flat", "-1", "flat") - set_char_box(1.2 stafflinethickness#, .8 interline#, .5 interline#, 2 interline#); - draw_meta_flat(0, w, 1/3 interline); + set_char_box(1.2 stafflinethickness#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#); + draw_meta_flat(0, w, 0.31 staff_space); fet_endchar; -fet_beginchar("Double flat", "-2", "flatflat") +fet_beginchar("Double Flat", "-2", "flatflat") save left_wid, overlap, right_wid; left_wid = .7; right_wid = .8; overlap = .05; - set_char_box(1.2 stafflinethickness#, (left_wid + right_wid -overlap) *interline#, .5 interline#, 2 interline#); - draw_meta_flat(0, left_wid* interline, 1/3 interline); - draw_meta_flat((left_wid - overlap) *interline, - right_wid *interline, 1/3 interline); + set_char_box(1.2 stafflinethickness#, (left_wid + right_wid -overlap) *staff_space#, .6 staff_space#, 1.9 staff_space#); + draw_meta_flat(0, left_wid* staff_space, 1/3 staff_space); + draw_meta_flat((left_wid - overlap) *staff_space, + right_wid *staff_space, 0.33 staff_space); fet_endchar; -fet_beginchar("Double sharp", "2", "sharpsharp") - set_char_box(0, interline#, .5 interline#, .5 interline#); +fet_beginchar("Double Sharp", "2", "sharpsharp") + set_char_box(0, staff_space#, .5 staff_space#, .5 staff_space#); save klaverblad, klaversteel; - klaversteel = 1/15 interline; - klaverblad = .35 interline; + klaversteel = 1/15 staff_space; + klaverblad = .35 staff_space; z1 = (klaversteel, 0); z2 = (w/2 - klaverblad / 10, h - klaverblad); @@ -219,9 +289,11 @@ fet_beginchar("Double sharp", "2", "sharpsharp") z5 = z1 reflectedabout((0,0), (1,1)); labels(1,2,3,4,5); - draw_rounded_path( - z1{dir 45} .. {right}z2 -- z3 -- z4{down} .. {dir 225}z5 .. cycle, - 1/20 interline); + pickup pencircle scaled 1/20 staff_space; + filldraw + z1{dir 45} .. {right}z2 -- z3 -- + z4{down} .. {dir 225}z5 .. cycle; + addto currentpicture also currentpicture yscaled (-d/h); addto currentpicture also currentpicture xscaled (-1); @@ -230,8 +302,38 @@ fet_beginchar("Double sharp", "2", "sharpsharp") currentpicture := currentpicture shifted (w/2,0); - fet_endchar; +fet_endchar; + + +def draw_paren = + save leftindent; + leftindent# := .2 staff_space#; + define_pixels(leftindent); + set_char_box(0, .5 staff_space#+stafflinethickness#, + staff_space#, staff_space#); + z1 = (leftindent,h); + z2 = (w-stafflinethickness,0); + z3 = (leftindent,-d); + + penpos1(stafflinethickness, 35); + penpos2(2 stafflinethickness, 0); + penpos3(stafflinethickness, -35); + + penlabels(1,2,3); + fill z2l{down} .. simple_serif(z3l, z3r, 90) .. z2r{up} + .. simple_serif(z1r, z1l, 90) .. z2l{down} -- cycle; +enddef; + +fet_beginchar("Right Parenthesis", "rightparen", "rightparen") + draw_paren; +fet_endchar; + +fet_beginchar("Left Parenthesis", "leftparen", "leftparen") + draw_paren; + currentpicture := currentpicture xscaled -1; + set_char_box(charwd, charbp, chardp, charht); +fet_endchar; fet_endgroup("accidentals");