X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-bolletjes.mf;h=cae8c200a8e84c093803b7090bb3751001a383cd;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=1483af4d9feeb72e49f0d6da5ccf5e05aaebc370;hpb=a6ef345436fad6539e1e3f9342281092c5eb19a4;p=lilypond.git diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf index 1483af4d9f..cae8c200a8 100644 --- a/mf/feta-bolletjes.mf +++ b/mf/feta-bolletjes.mf @@ -3,7 +3,7 @@ % % source file of LilyPond's pretty-but-neat music font % -% (c) 1997--2006 Jan Nieuwenhuizen +% (c) 1997--2008 Jan Nieuwenhuizen % & Han-Wen Nienhuys % & Juergen Reuter % @@ -145,6 +145,79 @@ endgroup; enddef; +% +% dimensions aren't entirely right. +% +def draw_longa (expr up) = + save stemthick, fudge; + + stemthick# = 2 stafflinethickness#; + define_whole_blacker_pixels (stemthick); + + fudge = hround (blot_diameter / 2); + + draw_outside_ellipse (1.80, 0, 0.707, 0); + undraw_inside_ellipse (1.30, 125, 0.68, 2 stafflinethickness#); + + pickup pencircle scaled stemthick; + + if up: + bot y1 = -d; + top y2 = h; + rt x1 - fudge = 0; + x1 = x2; + + fudge + lft x3 = w; + x4 = x3; + top y4 = h + 3.0 staff_space; + y3 = y1; + else: + bot y1 = -d - 3.0 staff_space; + top y2 = h; + rt x1 - fudge = 0; + x1 = x2; + + fudge + lft x3 = w; + x4 = x3; + y4 = y2; + bot y3 = -d; + fi; + + draw_gridline (z1, z2, stemthick); + draw_gridline (z3, z4, stemthick); + + labels (1, 2, 3, 4); +enddef; + + +fet_beginchar ("Longa notehead", "uM2"); + draw_longa (true); + + draw_staff (-2, 2, 0); +fet_endchar; + +fet_beginchar ("Longa notehead", "dM2"); + draw_longa (false); + + draw_staff (-2, 2, 0); +fet_endchar; + + +if test > 0: + fet_beginchar ("Longa notehead", "uM2"); + draw_longa (true); + + draw_staff (-2, 2, 0.5); + fet_endchar; + + fet_beginchar ("Longa notehead", "dM2"); + draw_longa (false); + + draw_staff (-2, 2, 0.5); + fet_endchar; +fi; + + % % dimensions aren't entirely right. % @@ -176,7 +249,7 @@ def draw_brevis = enddef; -fet_beginchar ("Brevis notehead", "s-1"); +fet_beginchar ("Brevis notehead", "sM1"); draw_brevis; draw_staff (-2, 2, 0); @@ -184,7 +257,7 @@ fet_endchar; if test > 0: - fet_beginchar ("Brevis notehead", "s-1"); + fet_beginchar ("Brevis notehead", "sM1"); draw_brevis; draw_staff (-2, 2, 0.5); @@ -215,8 +288,6 @@ if test > 0: fi; - - fet_beginchar ("Half notehead", "s1"); draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, 0.66, 0.17); undraw_inside_ellipse (3.25, 33, 0.81, 2.5 stafflinethickness#); @@ -247,6 +318,7 @@ fet_beginchar ("Quart notehead", "s2"); draw_staff (-2, 2, 0); fet_endchar; + if test > 0: fet_beginchar ("Quart notehead", "s2"); draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31, @@ -336,6 +408,9 @@ endgroup enddef; +% +% UGH: xs not declared as argument. +% def define_triangle_shape (expr stemdir) = save triangle_a, triangle_b, triangle_c; save triangle_out_a, triangle_out_b, triangle_out_c; @@ -372,7 +447,7 @@ def define_triangle_shape (expr stemdir) = set_char_box (0, width#, depth#, height#); % Formerly, the shape has simply been drawn with an elliptical pen - % (`scaled pen_thick xsaled xs'), but the envelope of such a curve + % (`scaled pen_thick xscaled xs'), but the envelope of such a curve % is of 6th degree. For the sake of mf2pt1, we approximate it. pickup pencircle scaled pen_thick xscaled xs; @@ -445,10 +520,10 @@ def define_triangle_shape (expr stemdir) = % attachment Y if stemdir = 1: charwy := ypart exact_right_point; - charwx := xpart exact_right_point; + charwx := xpart exact_right_point + .5 pen_thick# * xs; else: charwy := -ypart exact_down_point; - charwx := (width# - xpart exact_down_point); + charwx := width# - (xpart exact_down_point - .5 pen_thick# * xs); fi enddef; @@ -503,14 +578,14 @@ def draw_small_triangle_head (expr dir) = enddef; -fet_beginchar ("Half trianglehead", "d1triangle"); +fet_beginchar ("Half trianglehead (downstem)", "d1triangle"); draw_small_triangle_head (-1); draw_staff (-2, 2, 0); fet_endchar; -fet_beginchar ("Half trianglehead", "u1triangle"); +fet_beginchar ("Half trianglehead (upstem)", "u1triangle"); draw_small_triangle_head (1); draw_staff (-2, 2, 0.5); @@ -531,14 +606,14 @@ def draw_closed_triangle_head (expr dir) = enddef; -fet_beginchar ("Quart trianglehead", "u2triangle"); +fet_beginchar ("Quart trianglehead (upstem)", "u2triangle"); draw_closed_triangle_head (1); draw_staff (-2, 2, 0); fet_endchar; -fet_beginchar ("Quart trianglehead", "d2triangle"); +fet_beginchar ("Quart trianglehead (downstem)", "d2triangle"); draw_closed_triangle_head (-1); draw_staff (-2, 2, 0.5); @@ -1005,7 +1080,7 @@ def draw_re_head (expr width_factor, dir) = save p_in, p_out; path p_in, p_out; - set_char_box (0, width_factor * solfa_noteheight#, + set_char_box (0, width_factor * solfa_base_notewidth#, 0.5 solfa_noteheight#, 0.5 solfa_noteheight#); pickup pencircle scaled solfa_pen_thick; @@ -1089,7 +1164,7 @@ def draw_mi_head (expr width_factor) = path path_out, path_in; pair ne_dist, se_dist, ne, se; - set_char_box (0, width_factor * solfa_noteheight#, + set_char_box (0, width_factor * solfa_base_notewidth#, 0.5 solfa_noteheight#, 0.5 solfa_noteheight#); pickup pencircle scaled solfa_pen_thick; @@ -1164,7 +1239,7 @@ fet_endchar; def draw_fa_head (expr width_factor) = - set_char_box (0, width_factor * solfa_noteheight#, + set_char_box (0, width_factor * solfa_base_notewidth#, 0.5 solfa_noteheight#, 0.5 solfa_noteheight#); save p_down_in, p_down_out, p_up_in, p_up_out, nw_dist, nw; @@ -1255,7 +1330,7 @@ fet_endchar; def draw_la_head (expr width_factor) = - set_char_box (0, width_factor * solfa_noteheight#, + set_char_box (0, width_factor * solfa_base_notewidth#, 0.5 solfa_noteheight#, 0.5 solfa_noteheight#); save p_in, p_out; path p_in, p_out; @@ -1314,7 +1389,7 @@ fet_endchar; def draw_ti_head (expr width_factor, dir) = - set_char_box (0, width_factor * solfa_noteheight#, + set_char_box (0, width_factor * solfa_base_notewidth#, 0.5 solfa_noteheight#, 0.5 solfa_noteheight#); save p_in, p_out, p_top; save nw_dist, sw_dist, nw, sw;