X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-noteheads.mf;h=8f4cad6e3422ac85c5582bbf38fb14280f27174f;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=8b67607bf75165e72f48aad260490e5c55ee7902;hpb=f018757016404595c92e21346ae0661dafe7ea46;p=lilypond.git diff --git a/mf/feta-noteheads.mf b/mf/feta-noteheads.mf index 8b67607bf7..8f4cad6e34 100644 --- a/mf/feta-noteheads.mf +++ b/mf/feta-noteheads.mf @@ -1,15 +1,14 @@ % Feta (not the Font-En-Tja) music font -- implement noteheads % This file is part of LilyPond, the GNU music typesetter. % -% Copyright (C) 1997--2010 Jan Nieuwenhuizen +% Copyright (C) 1997--2015 Jan Nieuwenhuizen % & Han-Wen Nienhuys % & Juergen Reuter % -% -% LilyPond is free software: you can redistribute it and/or modify +% The LilyPond font is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by % the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. +% (at your option) any later version, or under the SIL Open Font License. % % LilyPond is distributed in the hope that it will be useful, % but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,108 +21,29 @@ test_outlines := 0; -save remember_pic; -picture remember_pic; - - % Most beautiful noteheads are pronounced, not circular, % and not even symmetric. % These examples are inspired by [Wanske]; see literature list. - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % NOTE HEAD VARIABLES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -save black_notehead_width, noteheight; -save half_notehead_width, whole_notehead_width, slash_thick; -save slash_slope, overdone_heads, solfa_noteheight; +save half_notehead_width, whole_notehead_width; +save solfa_noteheight; -numeric noteheight; -numeric slash_thick; -numeric black_notehead_width; numeric whole_notehead_width; numeric half_notehead_width; - fet_begingroup ("noteheads"); -% Slope of slash. From scm/grob-description.scm. How to auto-copy? -slash_slope := 1.7; - -% Thickness of slash lines. Quarter notes get 1.5slt width. -slash_thick# := 2/3 * 0.48 staff_space#; - - -% -% Hand-engraved music often has balls extending above and below -% the lines. If you like that, modify overdone heads (unit: -% stafflinethickness). -% -overdone_heads = 0.0; -noteheight# := staff_space# + (1 + overdone_heads) * stafflinethickness#; - - % % solfa heads should not overlap on chords. % solfa_noteheight# := staff_space# - stafflinethickness#; -define_pixels (slash_thick); -define_whole_vertical_pixels (noteheight); - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% SLANT moves both extrema on the long axis (by SLANT * ELLIPTICITY, -% so SLANT = -1, puts the extreme on the long axis next to the short -% axis one). -% - -def draw_outside_ellipse (expr ellipticity, tilt, superness, slant) = - save attachment_y; - save pat; - path pat; - - pat := superellipse ((ellipticity, 0), (-slant * ellipticity, 1.0), - (-ellipticity, 0), (slant * ellipticity, -1.0), - superness); - pat := pat rotated tilt; - - save top_point, right_point; - pair top_point, right_point; - - top_point := directionpoint left of pat; - right_point := directionpoint up of pat; - - save scaling, width; - - scaling# = noteheight# / (2 ypart (top_point)); - width# := 2 xpart (right_point) * scaling#; - define_pixels (scaling, width); - - set_char_box (0, width#, noteheight# / 2, noteheight# / 2); - - d := d - feta_space_shift; - - % attachment Y - charwy := ypart (right_point) * scaling#; - charwx := width#; - - pat := pat scaled scaling shifted (w / 2, .5 (h - d)); - - width := hround width; - - if test_outlines = 1: - draw pat; - else: - fill pat; - fi; -enddef; - - def undraw_inside_ellipse (expr ellipticity, tilt, superness, clearance) = begingroup save pat; @@ -156,47 +76,77 @@ 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); + % Longas of smaller design sizes should have their lines farther + % apart (the overlap with notehead ellipsoid should be smaller). + fudge = hround (blot_diameter + * min (max (-0.15, + (0.9 + - (20 / (design_size + 4)))), + 0.3)); draw_outside_ellipse (1.80, 0, 0.707, 0); undraw_inside_ellipse (1.30, 125, 0.68, 2 stafflinethickness#); pickup pencircle scaled stemthick; + % Longas of smaller design sizes should have their lines longer. + line_length := min (max (0.7, (64/60 - (design_size / 60))), 0.85); + + % Line lengths between 0.72 and 0.77 are not nice + % because they are neither separate nor connected + % when there is an interval of fourth. + if line_length < 0.75: + quanted_line_length := min (0.72, line_length); + else: + quanted_line_length := max (0.77, line_length); + fi; + + + final_line_length := quanted_line_length * staff_space; + + save boxtop, boxbot; + define_pixels (boxtop, boxbot); + if up: - bot y1 = -d; - top y2 = h; + bot y1 = -final_line_length; + top y2 = final_line_length; rt x1 - fudge = 0; x1 = x2; - fudge + lft x3 = w; + fudge + lft x3 = width; x4 = x3; top y4 = h + 3.0 staff_space; y3 = y1; + boxtop# := staff_space# * (quanted_line_length + 3.0) - stemthick# ; + boxbot# := staff_space# * quanted_line_length; else: bot y1 = -d - 3.0 staff_space; - top y2 = h; + top y2 = final_line_length; rt x1 - fudge = 0; x1 = x2; - fudge + lft x3 = w; + fudge + lft x3 = width; x4 = x3; y4 = y2; - bot y3 = -d; + bot y3 = -final_line_length; + boxtop# := staff_space# * quanted_line_length; + boxbot# := staff_space# * (quanted_line_length + 3.0) - stemthick# ; fi; draw_gridline (z1, z2, stemthick); draw_gridline (z3, z4, stemthick); + set_char_box (stemthick#, + width# + stemthick#, + boxbot#, + boxtop#); + labels (1, 2, 3, 4); enddef; @@ -204,100 +154,95 @@ enddef; fet_beginchar ("Longa notehead", "uM2"); draw_longa (true); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Longa notehead", "dM2"); draw_longa (false); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Longa notehead", "uM2"); - draw_longa (true); +def draw_brevis (expr linecount, line_thickness_multiplier) = + save stemthick, fudge, gap; - 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. -% -def draw_brevis (expr linecount) = - save stemthick, fudge; - - stemthick# = 2 stafflinethickness#; + stemthick# = line_thickness_multiplier * 2 * stafflinethickness#; define_whole_blacker_pixels (stemthick); - fudge = hround (blot_diameter / 2); + % double-lined breves of smaller design sizes should have + % bigger gap between the lines. + gap# := (0.95 - 0.008 * design_size) * stemthick#; + + % Breves of smaller design sizes should have their lines farther + % apart (the overlap with notehead ellipsoid should be smaller). + fudge = hround (blot_diameter + * min (max (-0.15, + (0.8 + - (20 / (design_size + 4)) + + .1 linecount)), + 0.3)); draw_outside_ellipse (1.80, 0, 0.707, 0); undraw_inside_ellipse (1.30, 125, 0.68, 2 stafflinethickness#); + define_pixels (gap); pickup pencircle scaled stemthick; - bot y1 = -d; - top y2 = h; + % Breves of smaller design sizes should have their lines longer. + line_length := min (max (0.7, (64/60 - (design_size / 60))), 0.85); + + % Line lengths between 0.72 and 0.77 are not nice + % because they are neither separate nor connected + % when there is an interval of fourth. + if line_length < 0.75: + quanted_line_length := min (0.72, line_length); + else: + quanted_line_length := max (0.77, line_length); + fi; + + set_char_box (stemthick# * linecount + gap# * (linecount - 1), + width# + stemthick# * linecount + gap# * (linecount - 1), + staff_space# * quanted_line_length, + staff_space# * quanted_line_length); + + bot y1 = -quanted_line_length * staff_space; + top y2 = quanted_line_length * staff_space; rt x1 - fudge = 0; x1 = x2; - fudge + lft x3 = w; + fudge + lft x3 = width; x4 = x3; y4 = y2; y3 = y1; for i := 0 step 1 until linecount - 1: - draw_gridline (z1 - (1.5 * i * stemthick, 0), - z2 - (1.5 * i * stemthick, 0), stemthick); - draw_gridline (z3 + (1.5 * i * stemthick, 0), - z4 + (1.5 * i * stemthick, 0), stemthick); + line_distance := i * (gap + stemthick); + draw_gridline (z1 - (line_distance, 0), + z2 - (line_distance, 0), + stemthick); + draw_gridline (z3 + (line_distance, 0), + z4 + (line_distance, 0), + stemthick); endfor; enddef; fet_beginchar ("Brevis notehead", "sM1"); - draw_brevis (1); + draw_brevis (1, 1); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Brevis notehead", "sM1"); - draw_brevis(1); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Double-lined brevis notehead", "sM1double"); - draw_brevis (2); + draw_brevis (2, 0.8); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Double-lined brevis notehead", "sM1double"); - draw_brevis (2); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Whole notehead", "s0"); draw_outside_ellipse (1.80 - puff_up_factor / 3.0, 0, 0.707, 0); undraw_inside_ellipse (1.30, 125 - puff_up_factor * 10, @@ -305,63 +250,26 @@ fet_beginchar ("Whole notehead", "s0"); whole_notehead_width# := charwd; - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole notehead", "s0"); - draw_outside_ellipse (1.80 - puff_up_factor / 3.0, 0, - 0.707, 0); - undraw_inside_ellipse (1.30, 125 - puff_up_factor * 10, - 0.68, 2 stafflinethickness#); - - draw_staff (-2, 2, 0.5); - fet_endchar; -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#); half_notehead_width# := charwd; - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - 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#); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - -fet_beginchar ("Quart notehead", "s2"); - % used to have 32. With 31, they are slightly bolder. - draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31, 0.707, 0); - black_notehead_width# := charwd; - - draw_staff (-2, 2, 0); +fet_beginchar ("Quarter notehead", "s2"); + draw_quarter_path; + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Quart notehead", "s2"); - draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31, - 0.707, 0); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -370,58 +278,26 @@ fet_beginchar ("Whole diamondhead", "s0diamond"); undraw_inside_ellipse (1.30, 125, 0.6, .4 staff_space# + stafflinethickness#); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole diamondhead", "s0diamond"); - draw_outside_ellipse (1.80, 0, 0.495, 0); - undraw_inside_ellipse (1.30, 125, 0.6, - .4 staff_space# + stafflinethickness#); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Half diamondhead", "s1diamond"); draw_outside_ellipse (1.50, 34, 0.49, 0.17); undraw_inside_ellipse (3.5, 33, 0.80, .3 staff_space# + 1.5 stafflinethickness#); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Half diamondhead", "s1diamond"); - draw_outside_ellipse (1.50, 34, 0.49, 0.17); - undraw_inside_ellipse (3.5, 33, 0.80, - .3 staff_space# - + 1.5 stafflinethickness#); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - -fet_beginchar ("Quart diamondhead", "s2diamond"); +fet_beginchar ("Quarter diamondhead", "s2diamond"); draw_outside_ellipse (1.80, 35, 0.495, -0.25); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Quart diamondhead", "s2diamond"); - draw_outside_ellipse (1.80, 35, 0.495, -0.25); - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -580,19 +456,10 @@ enddef; fet_beginchar ("Whole trianglehead", "s0triangle"); draw_whole_triangle_head; - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole trianglehead", "s0triangle"); - draw_whole_triangle_head; - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - def draw_small_triangle_head (expr dir) = save hei, xs; save llap; @@ -614,14 +481,14 @@ enddef; fet_beginchar ("Half trianglehead (downstem)", "d1triangle"); draw_small_triangle_head (-1); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Half trianglehead (upstem)", "u1triangle"); draw_small_triangle_head (1); - draw_staff (-2, 2, 0.5); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -639,17 +506,17 @@ def draw_closed_triangle_head (expr dir) = enddef; -fet_beginchar ("Quart trianglehead (upstem)", "u2triangle"); +fet_beginchar ("Quarter trianglehead (upstem)", "u2triangle"); draw_closed_triangle_head (1); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -fet_beginchar ("Quart trianglehead (downstem)", "d2triangle"); +fet_beginchar ("Quarter trianglehead (downstem)", "d2triangle"); draw_closed_triangle_head (-1); - draw_staff (-2, 2, 0.5); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -726,21 +593,21 @@ enddef; fet_beginchar ("Whole slashhead", "s0slash"); draw_slash (4 slash_thick# + 0.5 staff_space#); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Half slashhead", "s1slash"); draw_slash (3.0 slash_thick# + 0.15 staff_space#); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -fet_beginchar ("Quart slashhead", "s2slash"); +fet_beginchar ("Quarter slashhead", "s2slash"); draw_slash (1.5 slash_thick#); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -854,28 +721,10 @@ fet_beginchar ("Whole Crossed notehead", "s0cross"); draw_cross (3.75); - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole Crossed notehead", "s0cross"); - save wid, hei; - - wid# := black_notehead_width# + 4 stafflinethickness#; - hei# := noteheight# + stafflinethickness#; - - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Half Crossed notehead", "s1cross"); save wid, hei; @@ -886,28 +735,10 @@ fet_beginchar ("Half Crossed notehead", "s1cross"); draw_cross (3.0); - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Half Crossed notehead", "s1cross"); - save wid, hei; - - wid# := black_notehead_width# + 2 stafflinethickness#; - hei# := noteheight# + stafflinethickness# / 2; - - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Crossed notehead", "s2cross"); wid# := black_notehead_width#; hei# := noteheight#; @@ -915,25 +746,10 @@ fet_beginchar ("Crossed notehead", "s2cross"); draw_cross (1.0); - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Crossed notehead", "s2cross"); - wid# := black_notehead_width#; - hei# := noteheight#; - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("X-Circled notehead", "s2xcircle"); save wid, hei; save cthick, cxd, cyd, dy; @@ -979,29 +795,10 @@ fet_beginchar ("X-Circled notehead", "s2xcircle"); z12 = (charwx * hppp, charwy * vppp); labels (12); - remember_pic := currentpicture; - - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("X-Circled notehead", "s2xcircle"); - save wid, hei; - save cthick, cxr, cyr; - - wid# := black_notehead_width# * sqrt (sqrt2); - hei# := noteheight# * sqrt (sqrt2); - - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff (-2, 2, 0.5); - fet_endchar; -fi; - - %%%%%%%% % % SOLFA SHAPED NOTES @@ -1050,9 +847,6 @@ def draw_do_head (expr width_factor, dir, thickness_factor) = set_char_box (0, width_factor * solfa_base_notewidth#, 0.5 solfa_noteheight#, 0.5 solfa_noteheight#); - pickup pencircle scaled solfa_pen_thick; - - bottom_thick_factor := 2 * thickness_factor - 1; % no different thickness for left side if we want uniform thickness if thickness_factor = 1: @@ -1061,6 +855,12 @@ def draw_do_head (expr width_factor, dir, thickness_factor) = left_thick_factor := 0.7 * bottom_thick_factor; fi + save pen_radius; + pen_radius := min (solfa_pen_radius, + (h + d) / (3 * (1 + bottom_thick_factor))); + + pickup pencircle scaled (2 * pen_radius); + bot y1 = -d; y1 = y2; lft x1 = 0; @@ -1068,9 +868,9 @@ def draw_do_head (expr width_factor, dir, thickness_factor) = top y3 = h; x3 = .5 [x1, x2]; - left_dist = (unitvector (z3 - z1) rotated 90) * solfa_pen_radius; - right_dist = (unitvector (z2 - z3) rotated 90) * solfa_pen_radius; - bottom_dist = (0,1) * solfa_pen_radius; + left_dist = (unitvector (z3 - z1) rotated 90) * pen_radius; + right_dist = (unitvector (z2 - z3) rotated 90) * pen_radius; + bottom_dist = (0,1) * pen_radius; save pa, pb, pc; path pa, pb, pc; @@ -1138,13 +938,13 @@ fet_beginchar ("Half dohead", "u1do"); fet_endchar; -fet_beginchar ("Quart dohead", "d2do"); +fet_beginchar ("Quarter dohead", "d2do"); draw_do_head (solfa_quarter_width, -1, do_weight); fill p_out; fet_endchar; -fet_beginchar ("Quart dohead", "u2do"); +fet_beginchar ("Quarter dohead", "u2do"); draw_do_head (solfa_quarter_width, 1, do_weight); fill p_out; fet_endchar; @@ -1171,13 +971,13 @@ fet_beginchar ("Half thin dohead", "u1doThin"); fet_endchar; -fet_beginchar ("Quart thin dohead", "d2doThin"); +fet_beginchar ("Quarter thin dohead", "d2doThin"); draw_do_head (solfa_quarter_width, -1, 1); fill p_out; fet_endchar; -fet_beginchar ("Quart thin dohead", "u2doThin"); +fet_beginchar ("Quarter thin dohead", "u2doThin"); draw_do_head (solfa_quarter_width, 1, 1); fill p_out; fet_endchar; @@ -1195,7 +995,7 @@ fet_endchar; % whole notes) % % Note: According to some shape-note singers, there should be no size -% differences for half and whole notes, contrary to the comment above. +% differences for half and whole notes, contrary to the comment above. % Consequently, we have made them all the same width. % % stem attachment: h/2 @@ -1207,31 +1007,37 @@ def draw_re_head (expr width_factor, dir, thickness_factor) = set_char_box (0, width_factor * solfa_base_notewidth#, 0.5 solfa_noteheight#, 0.5 solfa_noteheight#); - pickup pencircle scaled solfa_pen_thick; + save offset; + offset = (2 * thickness_factor - 1); save curve_start; curve_start = 0.7; + + save pen_radius; + + pen_radius := min (solfa_pen_radius, + (h + d) * (1-curve_start) / (1+ offset)); + + pickup pencircle scaled (2 * pen_radius); + lft x1 = 0; - y1 = y5; - x1 = x2; + top y1 = h; + x2 = x1; y2 = curve_start [y3, y1]; bot y3 = -d; x3 = .5 [x2, x4]; rt x4 = w; y4 = y2; - top y5 = h; + y5 = y1; x5 = x4; - save offset; - offset = (2 * thickness_factor - 1); - labels (range 1 thru 5); - p_in := (z1 + solfa_pen_radius * (1, -1 * offset)) + p_in := (z1 + pen_radius * (1, -1 * offset)) -- rt z2{down} - .. ((top z3) + (0, offset * solfa_pen_radius)) + .. ((top z3) + (0, offset * pen_radius)) .. lft z4{up} - -- (z5 + solfa_pen_radius * (-1, -1 * offset)) + -- (z5 + pen_radius * (-1, -1 * offset)) -- cycle; p_out := lft z1 @@ -1276,13 +1082,13 @@ fet_beginchar ("Half down rehead", "d1re"); fet_endchar; -fet_beginchar ("Quart up rehead", "u2re"); +fet_beginchar ("Quarter up rehead", "u2re"); draw_re_head (solfa_quarter_width, 1, re_weight); fill p_out; fet_endchar; -fet_beginchar ("Quart down rehead", "d2re"); +fet_beginchar ("Quarter down rehead", "d2re"); draw_re_head (solfa_quarter_width, -1, re_weight); fill p_out; fet_endchar; @@ -1309,13 +1115,13 @@ fet_beginchar ("Half down thin rehead", "d1reThin"); fet_endchar; -fet_beginchar ("Quart thin rehead", "u2reThin"); +fet_beginchar ("Quarter thin rehead", "u2reThin"); draw_re_head (solfa_quarter_width, 1, 1); fill p_out; fet_endchar; -fet_beginchar ("Quart thin rehead", "d2reThin"); +fet_beginchar ("Quarter thin rehead", "d2reThin"); draw_re_head (solfa_quarter_width, -1, 1); fill p_out; fet_endchar; @@ -1339,11 +1145,20 @@ def draw_mi_head (expr width_factor, thickness_factor, mirror) = set_char_box (0, width_factor * solfa_base_notewidth#, 0.5 solfa_noteheight#, 0.5 solfa_noteheight#); - pickup pencircle scaled solfa_pen_thick; - save offset; offset := 2 * thickness_factor - 1; + save note_diagonal; + + note_diagonal := w / 2 ++ (h + d) / 2; + + save pen_radius; + + pen_radius := min (solfa_pen_radius, + .3 * note_diagonal / (1 + offset)); + + pickup pencircle scaled (2 * pen_radius); + lft x1 = 0; y1 = 0; bot y2 = -d; @@ -1362,8 +1177,8 @@ def draw_mi_head (expr width_factor, thickness_factor, mirror) = ne = unitvector (z4 - z1); se = unitvector (z2 - z1); - ne_dist = (ne rotated 90) * solfa_pen_radius; - se_dist = (se rotated 90) * solfa_pen_radius; + ne_dist = (ne rotated 90) * pen_radius; + se_dist = (se rotated 90) * pen_radius; path_a := (z1 + se_dist) -- (z2 + se_dist); @@ -1407,66 +1222,65 @@ def draw_mi_head (expr width_factor, thickness_factor, mirror) = enddef; -save mi_weight, mi_width; +save mi_weight; mi_weight := 2; -mi_width := 1.2; fet_beginchar ("Whole mihead", "s0mi"); - draw_mi_head (mi_width * solfa_whole_width, mi_weight, false); + draw_mi_head (solfa_whole_width, mi_weight, false); fill path_out; unfill path_in; fet_endchar; fet_beginchar ("Half mihead", "s1mi"); - draw_mi_head (mi_width * solfa_quarter_width, mi_weight, false); + draw_mi_head (solfa_quarter_width, mi_weight, false); fill path_out; unfill path_in; fet_endchar; -fet_beginchar ("Quart mihead", "s2mi"); - draw_mi_head (mi_width * solfa_quarter_width, mi_weight, false); +fet_beginchar ("Quarter mihead", "s2mi"); + draw_mi_head (solfa_quarter_width, mi_weight, false); fill path_out; fet_endchar; fet_beginchar ("Whole mirror mihead", "s0miMirror"); - draw_mi_head (mi_width * solfa_whole_width, mi_weight, true); + draw_mi_head (solfa_whole_width, mi_weight, true); fill path_out; unfill path_in; fet_endchar; fet_beginchar ("Half mirror mihead", "s1miMirror"); - draw_mi_head (mi_width * solfa_quarter_width, mi_weight, true); + draw_mi_head (solfa_quarter_width, mi_weight, true); fill path_out; unfill path_in; fet_endchar; -fet_beginchar ("Quart mirror mihead", "s2miMirror"); - draw_mi_head (mi_width * solfa_quarter_width, mi_weight, true); +fet_beginchar ("Quarter mirror mihead", "s2miMirror"); + draw_mi_head (solfa_quarter_width, mi_weight, true); fill path_out; fet_endchar; fet_beginchar ("Whole thin mihead", "s0miThin"); - draw_mi_head (mi_width * solfa_whole_width, 1, false); + draw_mi_head (solfa_whole_width, 1, false); fill path_out; unfill path_in; fet_endchar; fet_beginchar ("Half thin mihead", "s1miThin"); - draw_mi_head (mi_width * solfa_quarter_width, 1, false); + draw_mi_head (solfa_quarter_width, 1, false); fill path_out; unfill path_in; fet_endchar; -fet_beginchar ("Quart thin mihead", "s2miThin"); - draw_mi_head (mi_width * solfa_quarter_width, 1, false); +fet_beginchar ("Quarter thin mihead", "s2miThin"); + draw_mi_head (solfa_quarter_width, 1, false); fill path_out; fet_endchar; @@ -1487,9 +1301,13 @@ def draw_fa_head (expr width_factor, thickness_factor) = pair nw_dist, nw; save offset; - offset := 2 * thickness_factor - 0.5; + offset := 2 * thickness_factor - 1; - pickup pencircle scaled solfa_pen_thick; + save pen_radius; + pen_radius := min (solfa_pen_radius, + .33 * (h + d) / (1 + offset)); + + pickup pencircle scaled (2 * pen_radius); lft x1 = 0; top y1 = h; @@ -1505,12 +1323,12 @@ def draw_fa_head (expr width_factor, thickness_factor) = labels (1, 2, 3, 4); nw = unitvector (z1 - z3); - nw_dist = (nw rotated 90) * solfa_pen_radius; + nw_dist = (nw rotated 90) * pen_radius; - path_a := (z1 - (0,1) * offset * solfa_pen_radius) - -- (z2 - (0,1) * offset * solfa_pen_radius); - path_b := (z2 - (1,0) * solfa_pen_radius) - -- (z3 - (1,0) * solfa_pen_radius); + path_a := (z1 - (0,1) * offset * pen_radius) + -- (z2 - (0,1) * offset * pen_radius); + path_b := (z2 - (1,0) * pen_radius) + -- (z3 - (1,0) * pen_radius); path_c := (z3 - nw_dist) -- (z1 - nw_dist); @@ -1537,7 +1355,7 @@ def draw_fa_head (expr width_factor, thickness_factor) = enddef; save fa_weight; -fa_weight := 2; +fa_weight := 1.75; fet_beginchar ("Whole fa up head", "u0fa"); draw_fa_head (solfa_whole_width, fa_weight); @@ -1627,11 +1445,12 @@ fet_endchar; % so we can't just use the standard note font. % def draw_sol_head (expr filled) = - draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, 0.66, 0.17); + draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31, 0.707, 0); if not filled: - undraw_inside_ellipse (3.25, 33, 0.81, 2.5 stafflinethickness#); + undraw_inside_ellipse (2.5 - puff_up_factor / 3.0, 31, 0.707, + 3.5 stafflinethickness#); fi - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); enddef; fet_beginchar ("Whole solhead", "s0sol"); @@ -1644,7 +1463,7 @@ fet_beginchar ("Half solhead", "s1sol"); fet_endchar; -fet_beginchar ("Quart solhead", "s2sol"); +fet_beginchar ("Quarter solhead", "s2sol"); draw_sol_head ( true); fet_endchar; @@ -1659,11 +1478,15 @@ def draw_la_head (expr width_factor, thickness_factor) = save p_in, p_out; path p_in, p_out; - pickup pencircle scaled solfa_pen_thick; - save offset; offset := 2 * thickness_factor - 1; + save pen_radius; + pen_radius := min (solfa_pen_radius, + .35 * (h + d) / (1 + offset)); + + pickup pencircle scaled (2 * pen_radius); + lft x1 = 0; top y1 = h; @@ -1677,10 +1500,10 @@ def draw_la_head (expr width_factor, thickness_factor) = labels (range 1 thru 4); - p_in := (z1 + solfa_pen_radius * (1, -offset)) - -- (z2 + solfa_pen_radius * (-1, -offset)) - -- (z3 + solfa_pen_radius * (-1, offset)) - -- (z4 + solfa_pen_radius * (1, offset)) + p_in := (z1 + pen_radius * (1, -offset)) + -- (z2 + pen_radius * (-1, -offset)) + -- (z3 + pen_radius * (-1, offset)) + -- (z4 + pen_radius * (1, offset)) -- cycle; p_out := top z1 @@ -1712,7 +1535,7 @@ fet_beginchar ("Half lahead", "s1la"); fet_endchar; -fet_beginchar ("Quart lahead", "s2la"); +fet_beginchar ("Quarter lahead", "s2la"); draw_la_head (solfa_quarter_width, la_weight); fill p_out; fet_endchar; @@ -1732,7 +1555,7 @@ fet_beginchar ("Half thin lahead", "s1laThin"); fet_endchar; -fet_beginchar ("Quart lahead", "s2laThin"); +fet_beginchar ("Quarter lahead", "s2laThin"); draw_la_head (solfa_quarter_width, 1); fill p_out; fet_endchar; @@ -1753,7 +1576,11 @@ def draw_ti_head (expr width_factor, dir, thickness_factor) = save offset; offset := 2 * thickness_factor - 1; - pickup pencircle scaled solfa_pen_thick; + save pen_radius; + pen_radius := min (solfa_pen_radius, + .4 * (h + d) / (1 + offset)); + + pickup pencircle scaled (2 * pen_radius); x1 = .5 [x2, x4]; bot y1 = -d; @@ -1764,7 +1591,7 @@ def draw_ti_head (expr width_factor, dir, thickness_factor) = x3 = x1; top y3 = h; x5 = x1; - y5 = y1 + offset * solfa_pen_radius; + y5 = y1 + offset * pen_radius; labels (range 1 thru 4); @@ -1774,16 +1601,16 @@ def draw_ti_head (expr width_factor, dir, thickness_factor) = nw = unitvector (z2 - z1); sw = unitvector (z1 - z4); - nw_dist = (nw rotated 90) * solfa_pen_radius; - sw_dist = (sw rotated 90) * solfa_pen_radius; + nw_dist = (nw rotated 90) * pen_radius; + sw_dist = (sw rotated 90) * pen_radius; - p_top := (z2 + nw * solfa_pen_radius) + p_top := (z2 + nw * pen_radius) .. (top z3){right} - .. (z4 - sw * solfa_pen_radius); + .. (z4 - sw * pen_radius); - p_top_in := (z2 - nw * offset * solfa_pen_radius) - .. (z3 - (0,1) * solfa_pen_radius) {right} - .. (z4 + sw * offset * solfa_pen_radius); + p_top_in := (z2 - nw * offset * pen_radius) + .. (z3 - (0,1) * pen_radius) {right} + .. (z4 + sw * offset * pen_radius); save path_a, path_b; path path_a, path_b; @@ -1805,9 +1632,9 @@ def draw_ti_head (expr width_factor, dir, thickness_factor) = .. (z1 + nw_dist) -- (z2 + nw_dist) .. lft z2 - .. (z2 + nw * solfa_pen_radius){direction 0 of p_top} + .. (z2 + nw * pen_radius){direction 0 of p_top} & p_top - & {direction infinity of p_top}(z4 - sw * solfa_pen_radius) + & {direction infinity of p_top}(z4 - sw * pen_radius) .. rt z4 .. (z4 + sw_dist) -- (z1 + sw_dist) @@ -1845,13 +1672,13 @@ fet_beginchar ("Half down tihead", "d1ti"); fet_endchar; -fet_beginchar ("Quart up tihead", "u2ti"); +fet_beginchar ("Quarter up tihead", "u2ti"); draw_ti_head (solfa_quarter_width, 1, ti_weight); fill p_out; fet_endchar; -fet_beginchar ("Quart down tihead", "d2ti"); +fet_beginchar ("Quarter down tihead", "d2ti"); draw_ti_head (solfa_quarter_width, -1, ti_weight); fill p_out; fet_endchar; @@ -1878,13 +1705,13 @@ fet_beginchar ("Half thin down tihead", "d1tiThin"); fet_endchar; -fet_beginchar ("Quart thin up tihead", "u2tiThin"); +fet_beginchar ("Quarter thin up tihead", "u2tiThin"); draw_ti_head (solfa_quarter_width, 1, 1); fill p_out; fet_endchar; -fet_beginchar ("Quart thin down tihead", "d2tiThin"); +fet_beginchar ("Quarter thin down tihead", "d2tiThin"); draw_ti_head (solfa_quarter_width, -1, 1); fill p_out; fet_endchar; @@ -1906,10 +1733,15 @@ def draw_Funk_do_head (expr width_factor, thickness_factor) = set_char_box (0, width_factor * solfa_base_notewidth#, 0.5 solfa_noteheight#, 0.5 solfa_noteheight#); - pickup pencircle scaled solfa_pen_thick; save offset; offset := 2 * thickness_factor - 1; + save pen_radius; + pen_radius := min (solfa_pen_radius, + .3 * (h + d) / (1 + offset)); + + pickup pencircle scaled (2 * pen_radius); + rt x1 = w; bot y1 = -d; @@ -1919,21 +1751,21 @@ def draw_Funk_do_head (expr width_factor, thickness_factor) = x3 = x1; top y3 = h; - x4 = x1 - solfa_pen_radius; - y4 = y1 + offset * solfa_pen_radius; + x4 = x1 - pen_radius; + y4 = y1 + offset * pen_radius; y5 = y2; - x5 = x2 + solfa_pen_radius; + x5 = x2 + pen_radius; x6 = x4; - y6 = y3 - offset * solfa_pen_radius; + y6 = y3 - offset * pen_radius; save p_up_in, p_up_out, p_down_in, p_down_out; path p_up_in, p_up_out, p_down_in, p_down_out; p_down_in := z4{left} - .. z5{up} - .. z6{right} + ... z5{up} + ... z6{right} -- cycle; p_down_out := bot z1{left} @@ -2000,10 +1832,15 @@ def draw_Funk_re_head (expr width_factor, thickness_factor) = set_char_box (0, width_factor * solfa_base_notewidth#, 0.5 solfa_noteheight#, 0.5 solfa_noteheight#); - pickup pencircle scaled solfa_pen_thick; save offset; offset := 2 * thickness_factor - 1; + save pen_radius; + pen_radius := min (solfa_pen_radius, + .3 * (h + d) / (1 + offset)); + + pickup pencircle scaled (2 * pen_radius); + save curve_in; curve_in := 0.9; @@ -2037,14 +1874,14 @@ def draw_Funk_re_head (expr width_factor, thickness_factor) = path_d := z2 .. z3{down} .. z4; arrow_a_perp = unitvector (direction 0 of path_d rotated 90) - * solfa_pen_radius; - arrow_b_perp = unitvector (direction 1 of path_d rotated 90) - * solfa_pen_radius; - - path_b := (z1 + se_perp * solfa_pen_radius) - -- z4 + se_perp * offset * solfa_pen_radius; - path_a := (z1 - ne_perp * solfa_pen_radius) - -- z2 - ne_perp * offset * solfa_pen_radius; + * pen_radius; + arrow_b_perp = unitvector (direction 2 of path_d rotated 90) + * pen_radius; + + path_b := (z1 + se_perp * pen_radius) + -- z4 + se_perp * offset * pen_radius; + path_a := (z1 - ne_perp * pen_radius) + -- z2 - ne_perp * offset * pen_radius; path_c := z2 - arrow_a_perp .. z6{down} .. z4 - arrow_b_perp; @@ -2063,8 +1900,8 @@ def draw_Funk_re_head (expr width_factor, thickness_factor) = -- cycle; p_down_out := lft z1{up} - .. (z1 + ne_perp * solfa_pen_radius){ne} - -- (z2 + ne_perp * solfa_pen_radius){ne} + .. (z1 + ne_perp * pen_radius){ne} + -- (z2 + ne_perp * pen_radius){ne} .. top z2 {right} .. rt z2{down} .. (z2 + arrow_a_perp) @@ -2072,8 +1909,8 @@ def draw_Funk_re_head (expr width_factor, thickness_factor) = .. (z4 + arrow_b_perp) .. rt z4{down} .. bot z4 {left} - .. z4 - se_perp * solfa_pen_radius - -- z1 - se_perp * solfa_pen_radius + .. z4 - se_perp * pen_radius + -- z1 - se_perp * pen_radius .. cycle; p_up_in := p_down_in rotated 180 shifted (w, 0); @@ -2129,12 +1966,11 @@ fet_endchar; % Diamond shape % Has up and down shapes for all hollow notes % -save funk_mi_width, funk_mi_weight; -funk_mi_width := 1.2; +save funk_mi_weight; funk_mi_weight := 1.9; fet_beginchar ("Whole up Funk mihead", "u0miFunk"); - draw_mi_head (funk_mi_width * funk_notehead_width, + draw_mi_head (funk_notehead_width, funk_mi_weight, false); fill path_out; unfill path_in; @@ -2142,7 +1978,7 @@ fet_endchar; fet_beginchar ("Whole down Funk mihead", "d0miFunk"); - draw_mi_head (funk_mi_width * funk_notehead_width, + draw_mi_head (funk_notehead_width, funk_mi_weight, true); fill path_out; unfill path_in; @@ -2150,7 +1986,7 @@ fet_endchar; fet_beginchar ("Half up Funk mihead", "u1miFunk"); - draw_mi_head (funk_mi_width * funk_notehead_width, + draw_mi_head (funk_notehead_width, funk_mi_weight, false); fill path_out; unfill path_in; @@ -2158,7 +1994,7 @@ fet_endchar; fet_beginchar ("Half down Funk mihead", "d1miFunk"); - draw_mi_head (funk_mi_width * funk_notehead_width, + draw_mi_head (funk_notehead_width, funk_mi_weight, true); fill path_out; unfill path_in; @@ -2166,7 +2002,7 @@ fet_endchar; fet_beginchar ("Quarter Funk mihead", "s2miFunk"); - draw_mi_head (funk_mi_width * funk_notehead_width, + draw_mi_head (funk_notehead_width, funk_mi_weight, false); fill path_out; fet_endchar; @@ -2232,7 +2068,7 @@ begingroup if not filled: undraw_inside_ellipse (1.9, 33, 0.74, 5.5 stafflinethickness#); fi - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); endgroup enddef; @@ -2274,7 +2110,7 @@ fet_beginchar ("Half Funk lahead", "s1laFunk"); fet_endchar; -fet_beginchar ("Quart Funk lahead", "s2laFunk"); +fet_beginchar ("Quarter Funk lahead", "s2laFunk"); draw_la_head (funk_notehead_width, funk_notehead_width); fill p_out; fet_endchar; @@ -2293,7 +2129,11 @@ def draw_Funk_ti_head (expr width_factor, thickness_factor) = save offset; offset := 2 * thickness_factor - 1; - pickup pencircle scaled solfa_pen_thick; + save pen_radius; + pen_radius := min (solfa_pen_radius, + .33 * (h + d) / (1 + offset)); + + pickup pencircle scaled (2 * pen_radius); lft x1 = 0; y1 = .5 [y2, y4]; @@ -2313,8 +2153,8 @@ def draw_Funk_ti_head (expr width_factor, thickness_factor) = ne = unitvector (z2 - z1); se = unitvector (z4 - z1); - nw_dist = (ne rotated 90) * solfa_pen_radius ; - sw_dist = (se rotated -90) * solfa_pen_radius; + nw_dist = (ne rotated 90) * pen_radius ; + sw_dist = (se rotated -90) * pen_radius; save path_a, path_b; path path_a, path_b; @@ -2325,13 +2165,13 @@ def draw_Funk_ti_head (expr width_factor, thickness_factor) = save path_right, path_right_in; path path_right, path_right_in; - path_right := (z2 + ne * solfa_pen_radius) + path_right := (z2 + ne * pen_radius) .. (rt z3){down} - .. (z4 + se * solfa_pen_radius); + .. (z4 + se * pen_radius); - path_right_in := (z2 - ne * solfa_pen_radius) + path_right_in := (z2 - ne * pen_radius) .. lft z3{down} - .. (z4 - se * solfa_pen_radius); + .. (z4 - se * pen_radius); z5 = path_a intersectionpoint path_b; z6 = path_a intersectionpoint path_right_in; @@ -2350,9 +2190,9 @@ def draw_Funk_ti_head (expr width_factor, thickness_factor) = .. (z1 + nw_dist) -- (z2 + nw_dist) .. top z2 - .. (z2 + ne * solfa_pen_radius){direction 0 of path_right} + .. (z2 + ne * pen_radius){direction 0 of path_right} & path_right - & {direction infinity of path_right}(z4 + se * solfa_pen_radius) + & {direction infinity of path_right}(z4 + se * pen_radius) .. bot z4 .. (z4 + sw_dist) -- (z1 + sw_dist) @@ -2541,10 +2381,15 @@ def draw_Walker_re_head (expr width_factor, thickness_factor) = set_char_box (0, width_factor * solfa_base_notewidth#, 0.5 solfa_noteheight#, 0.5 solfa_noteheight#); - pickup pencircle scaled solfa_pen_thick; save offset; offset := 2 * thickness_factor - 1; + save pen_radius; + pen_radius := min (solfa_pen_radius, + .3 * (h + d) / (1 + offset)); + + pickup pencircle scaled (2 * pen_radius); + save dish_factor; dish_factor := 0.20; @@ -2561,16 +2406,16 @@ def draw_Walker_re_head (expr width_factor, thickness_factor) = y4 = y2; x5 = x1; - y5 = y1 + offset * solfa_pen_radius; + y5 = y1 + offset * pen_radius; y6 = y2; - x6 = x2 + solfa_pen_radius; + x6 = x2 + pen_radius; x7 = x3; - y7 = y3 - offset * solfa_pen_radius; + y7 = y3 - offset * pen_radius; y8 = y4; - x8 = x4 - solfa_pen_radius; + x8 = x4 - pen_radius; save path_a, path_d; path path_a, path_d; @@ -2582,8 +2427,8 @@ def draw_Walker_re_head (expr width_factor, thickness_factor) = p_a_start_dir := unitvector(direction 0 of path_a); p_a_end_dir := unitvector(direction infinity of path_a); - p_a_start_perp := (p_a_start_dir rotated 90) * solfa_pen_radius; - p_a_end_perp := (p_a_end_dir rotated 90) * solfa_pen_radius; + p_a_start_perp := (p_a_start_dir rotated 90) * pen_radius; + p_a_end_perp := (p_a_end_dir rotated 90) * pen_radius; path_d := (z3 - p_a_start_perp){p_a_start_dir} .. z4 {down} @@ -2600,20 +2445,14 @@ def draw_Walker_re_head (expr width_factor, thickness_factor) = labels (range 1 thru 4); - save p_in_dir_b, p_in_dir_c; - pair p_in_dir_b, p_in_dir_c; - - p_in_dir_b := unitvector (direction 0.4 of path_b); - p_in_dir_c := unitvector (direction 0.4 of path_c); - save p_up_in, p_up_out, p_down_in, p_down_out; path p_up_in, p_up_out, p_down_in, p_down_out; - p_down_in := z6{up} .. tension 1 and 1.5 - .. {- p_in_dir_c} z10 {p_a_start_dir} + p_down_in := z6{up} + ... {right} z10 {p_a_start_dir} .. z8{down} - .. {p_a_end_dir} z9 {p_in_dir_b} .. tension 1.5 and 1 - .. cycle; + .. {p_a_end_dir} z9 {left} + ... cycle; p_down_out := lft z2{up} .. top z3{right} @@ -2631,7 +2470,7 @@ enddef; save walker_re_weight; -walker_re_weight := 1.5; +walker_re_weight := 1.2; fet_beginchar ("Whole Walker rehead", "s0reWalker"); draw_Walker_re_head (funk_notehead_width, walker_re_weight); @@ -2671,7 +2510,7 @@ fet_endchar; % Symmetric for all hollow notes % save walker_mi_width, walker_mi_weight; -walker_mi_width := 1.2; +walker_mi_width := 1; walker_mi_weight := 1.5; fet_beginchar ("Whole Walker mihead", "s0miWalker"); @@ -2766,7 +2605,7 @@ fet_beginchar ("Half Funk lahead", "s1laWalker"); fet_endchar; -fet_beginchar ("Quart Funk lahead", "s2laWalker"); +fet_beginchar ("Quarter Funk lahead", "s2laWalker"); draw_la_head (funk_notehead_width, walker_la_weight); fill p_out; fet_endchar; @@ -2783,7 +2622,11 @@ def draw_Walker_ti_head (expr width_factor, thickness_factor) = save offset; offset := 2 * thickness_factor - 1; - pickup pencircle scaled solfa_pen_thick; + save pen_radius; + pen_radius := min (solfa_pen_radius, + .3 * (h + d) / (1 + offset)); + + pickup pencircle scaled (2 * pen_radius); lft x1 = 0; y1 = .5 [y2, y3]; @@ -2803,8 +2646,8 @@ def draw_Walker_ti_head (expr width_factor, thickness_factor) = ne = unitvector (z2 - z1); se = unitvector (z3 - z1); - nw_dist = (ne rotated 90) * solfa_pen_radius ; - sw_dist = (se rotated -90) * solfa_pen_radius; + nw_dist = (ne rotated 90) * pen_radius ; + sw_dist = (se rotated -90) * pen_radius; save path_a, path_b, path_c; @@ -2813,8 +2656,8 @@ def draw_Walker_ti_head (expr width_factor, thickness_factor) = -- z1 - nw_dist * offset; path_b := z3 - sw_dist * offset -- z1 - sw_dist * offset; - path_c := z2 + left * solfa_pen_radius - -- z3 + left * solfa_pen_radius; + path_c := z2 + left * pen_radius + -- z3 + left * pen_radius; z4 = path_a intersectionpoint path_b; z5 = path_a intersectionpoint path_c;