X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-ties.mf;h=c2124b88e9c051e0c40d745754966d661b00203c;hb=HEAD;hp=fc0ccb14a4a47ff795e120039de4d4b8c037f893;hpb=9446d6a4f83a94754f584d2d973195fd800d1af6;p=lilypond.git diff --git a/mf/feta-ties.mf b/mf/feta-ties.mf index fc0ccb14a4..c2124b88e9 100644 --- a/mf/feta-ties.mf +++ b/mf/feta-ties.mf @@ -1,12 +1,12 @@ % Feta (not the Font-En-Tja) music font -- small ties % This file is part of LilyPond, the GNU music typesetter. % -% Copyright (C) 2011 Bertrand Bordage +% Copyright (C) 2011--2015 Bertrand Bordage % -% 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 @@ -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;