X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-ties.mf;h=62702e92ffcdad5e5f13a4bc61ccdca4416e9f8c;hb=5b1f3adfe5e3561eaa0f9440e0697054084b7107;hp=784f50bbaac8e8e6229d4155b2d7ea19e414a59f;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git diff --git a/mf/feta-ties.mf b/mf/feta-ties.mf index 784f50bbaa..62702e92ff 100644 --- a/mf/feta-ties.mf +++ b/mf/feta-ties.mf @@ -27,6 +27,7 @@ max_height := .4 staff_space#; thin := 1.2 linethickness; thick := 2 linethickness; + def draw_lyric_tie (expr width_sharp) = save padding, angularity, width, height, depth; @@ -34,11 +35,10 @@ def draw_lyric_tie (expr width_sharp) = angularity := 2.5; width# := max (min (width_sharp, max_width), min_width); height# := (max (width# - min_width, 0) / (max_width - min_width)) - [min_height, max_height]; + [min_height, max_height]; depth# := padding# + height#; - set_char_box (0, 0, - depth#, 0); + set_char_box (0, 0, depth#, 0); define_pixels (width, padding); @@ -51,18 +51,20 @@ def draw_lyric_tie (expr width_sharp) = penpos3 (thin, angularity * angle (z3 - z2) + 90); fill z2l - .. simple_serif (z3l, z3r, 90) - .. z2r - .. simple_serif (z1r, z1l, 90) - .. cycle; + .. simple_serif (z3l, z3r, 90) + .. z2r + .. simple_serif (z1r, z1l, 90) + .. cycle; penlabels (1, 2, 3); enddef; + fet_beginchar ("Short lyric tie", "lyric.short"); draw_lyric_tie (1.25 staff_space#); fet_endchar; + fet_beginchar ("Default lyric tie", "lyric.default"); draw_lyric_tie (1.75 staff_space#); fet_endchar;