X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-flags.mf;h=b7fe2f0951c1f4817907d92dc8d11096755516b8;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=90407a456fb9a26f491219d0413c8ef63e621808;hpb=4bd5afd43afde18e22fa3077811a1fd136f2a28c;p=lilypond.git diff --git a/mf/feta-flags.mf b/mf/feta-flags.mf index 90407a456f..b7fe2f0951 100644 --- a/mf/feta-flags.mf +++ b/mf/feta-flags.mf @@ -1,12 +1,12 @@ % Feta (not the Font-En-Tja) music font -- draw flags % This file is part of LilyPond, the GNU music typesetter. % -% Copyright (C) 1997--2011 Han-Wen Nienhuys +% Copyright (C) 1997--2015 Han-Wen Nienhuys % -% 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 @@ -133,12 +133,14 @@ endgroup enddef; -fet_beginchar ("8th Flag (up)", "u3"); + + +def upstemsingleflag (expr shortening) = save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; flag_count = 1; - total_depth# = 3 staff_space# - blot_diameter# / 2; + total_depth# = (3 - shortening) * staff_space# - blot_diameter# / 2; flare = staff_space; flagspace# = staff_space#; hip_depth_ratio = .72; @@ -160,15 +162,15 @@ fet_beginchar ("8th Flag (up)", "u3"); draw_square_block ((-0.5 stemthickness_rounded, 0), (0, (-flag_count * staff_space_rounded))); -fet_endchar; +enddef; -fet_beginchar ("16th Flag (up)", "u4"); +def upstemdoubleflag (expr shortening) = save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; flag_count = 2; - total_depth# = 3.5 staff_space# - blot_diameter# / 2; + total_depth# = (3.5 - shortening) * staff_space# - blot_diameter# / 2; flare = .85 staff_space; flagspace# = .85 staff_space#; hip_depth_ratio = .72; @@ -193,15 +195,15 @@ fet_beginchar ("16th Flag (up)", "u4"); draw_square_block ((-0.5 stemthickness_rounded, 0), (0, (-flag_count * staff_space_rounded))); -fet_endchar; +enddef; -fet_beginchar ("32nd Flag (up)", "u5"); +def upstemtripleflag (expr shortening) = save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; flag_count = 3; - total_depth# = 4.25 staff_space#; + total_depth# = (4.25 - shortening) * staff_space# - blot_diameter# / 2; flare = .85 staff_space; flagspace# = .87 staff_space#; hip_depth_ratio = .72; @@ -228,15 +230,15 @@ fet_beginchar ("32nd Flag (up)", "u5"); draw_square_block ((-0.5 stemthickness_rounded, 0), (0, (-flag_count * staff_space_rounded))); -fet_endchar; +enddef; -fet_beginchar ("64th Flag (up)", "u6"); +def upstemquadrupleflag (expr shortening) = save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; flag_count = 4; - total_depth# = 5.25 staff_space#; + total_depth# = (5.25 - shortening) * staff_space# - blot_diameter# / 2; flare = .85 staff_space; flagspace# = .9 staff_space#; hip_depth_ratio = .72; @@ -265,15 +267,15 @@ fet_beginchar ("64th Flag (up)", "u6"); draw_square_block ((-0.5 stemthickness_rounded, 0), (0, (-flag_count * staff_space_rounded))); -fet_endchar; +enddef; -fet_beginchar ("128th Flag (up)", "u7"); +def upstemquintupleflag (expr shortening) = save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; flag_count = 5; - total_depth# = 6.25 staff_space#; + total_depth# = (6.25 - shortening) * staff_space# - blot_diameter# / 2; flare = .85 staff_space; flagspace# = .93 staff_space#; hip_depth_ratio = .72; @@ -304,20 +306,22 @@ fet_beginchar ("128th Flag (up)", "u7"); draw_square_block ((-0.5 stemthickness_rounded, 0), (0, (-flag_count * staff_space_rounded))); -fet_endchar; +enddef; + + -fet_beginchar ("8th (down)", "d3"); +def downstemsingleflag (expr shortening) = save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; flag_count = 1; - total_depth# = 2.85 staff_space#; + total_depth# = (2.75 - shortening) * staff_space#; flare = staff_space; flagspace# = .9 staff_space#; - hip_depth_ratio = .72; + hip_depth_ratio = .74; hip_width# = downflag_width# - hip_thickness# / 2; - foot_width_ratio = .8; + foot_width_ratio = .85; (flag_count - 1) * flagspace# + foot_depth# = total_depth#; @@ -336,16 +340,16 @@ fet_beginchar ("8th (down)", "d3"); (0, (-flag_count * staff_space_rounded))); y_mirror_char; -fet_endchar; +enddef; -fet_beginchar ("16th (down)", "d4"); +def downstemdoubleflag (expr shortening) = save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; flag_count = 2; - total_depth# = 3.0 staff_space# - blot_diameter# / 2; - flare = .8 staff_space; + total_depth# = (3.0 - shortening) * staff_space# - blot_diameter# / 2; + flare = .82 staff_space; flagspace# = .9 staff_space#; hip_depth_ratio = .85; hip_width# = downflag_width# - hip_thickness# / 2; @@ -371,20 +375,20 @@ fet_beginchar ("16th (down)", "d4"); (0, (-flag_count * staff_space_rounded))); y_mirror_char; -fet_endchar; +enddef; -fet_beginchar ("32nd (down)", "d5"); +def downstemtripleflag (expr shortening) = save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; flag_count = 3; - total_depth# = 3.85 staff_space#; - flare = .84 staff_space; - flagspace# = .9 staff_space#; - hip_depth_ratio = .85; + total_depth# = (3.75 - shortening) * staff_space# - blot_diameter# / 2; + flare = .82 staff_space; + flagspace# = .88 staff_space#; + hip_depth_ratio = .87; hip_width# = downflag_width# - hip_thickness# / 2; - foot_width_ratio = .95; + foot_width_ratio = .965; (flag_count - 1) * flagspace# + foot_depth# = total_depth#; @@ -399,29 +403,29 @@ fet_beginchar ("32nd (down)", "d5"); hip_depth_ratio, foot_width_ratio, hip_thickness, foot_thickness, 0); - add_flag (flagspace, flare, .97, 1.00, 1.25, + add_flag (flagspace, flare, .98, 1.00, 1.22, hip_thickness, foot_thickness); - add_flag (flagspace, flare, .95, 1.05, 1.25, + add_flag (flagspace, flare, .95, 1.02, 1.22, hip_thickness, foot_thickness); draw_square_block ((-0.5 stemthickness_rounded, 0), (0, (-flag_count * staff_space_rounded))); y_mirror_char; -fet_endchar; +enddef; -fet_beginchar ("64th (down)", "d6"); +def downstemquadrupleflag (expr shortening) = save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; flag_count = 4; - total_depth# = 4.35 staff_space#; + total_depth# = (4.5 - shortening) * staff_space# - blot_diameter# / 2; flare = .8 staff_space; flagspace# = .9 staff_space#; - hip_depth_ratio = .85; + hip_depth_ratio = .83; hip_width# = downflag_width# - hip_thickness# / 2; - foot_width_ratio = .98; + foot_width_ratio = .975; (flag_count - 1) * flagspace# + foot_depth# = total_depth#; @@ -436,28 +440,28 @@ fet_beginchar ("64th (down)", "d6"); hip_depth_ratio, foot_width_ratio, hip_thickness, foot_thickness, 0); - add_flag (flagspace, flare, .97, 1.20, 1.175, + add_flag (flagspace, flare, .98, 1.10, 1.19, hip_thickness, foot_thickness); - add_flag (flagspace, flare, .97, 1.10, 1.175, + add_flag (flagspace, flare, .98, 1.08, 1.19, hip_thickness, foot_thickness); - add_flag (.98 flagspace, flare, .91, 1.05, 1.2, + add_flag (.98 flagspace, flare, .94, 1.04, 1.21, hip_thickness, foot_thickness); draw_square_block ((-0.5 stemthickness_rounded, 0), (0, (-flag_count * staff_space_rounded))); y_mirror_char; -fet_endchar; +enddef; -fet_beginchar ("128th (down)", "d7"); +def downstemquintupleflag (expr shortening) = save flare, hip_depth_ratio, hip_width, foot_depth, foot_width_ratio; save flagspace, total_depth, flag_count; flag_count = 5; - total_depth# = 5.25 staff_space#; + total_depth# = (5.5 - shortening) * staff_space# - blot_diameter# / 2; flare = .8 staff_space; - flagspace# = .9 staff_space#; + flagspace# = .92 staff_space#; hip_depth_ratio = .85; hip_width# = downflag_width# - hip_thickness# / 2; foot_width_ratio = .98; @@ -475,25 +479,82 @@ fet_beginchar ("128th (down)", "d7"); hip_depth_ratio, foot_width_ratio, hip_thickness, foot_thickness, 0); - add_flag (flagspace, flare, .97, 1.20, 1.175, + add_flag (flagspace, flare, .98, 1.10, 1.185, hip_thickness, foot_thickness); - add_flag (flagspace, flare, .97, 1.10, 1.175, + add_flag (flagspace, flare, .98, 1.08, 1.185, hip_thickness, foot_thickness); - add_flag (.98 flagspace, flare, .91, 1.05, 1.2, + add_flag (.98 flagspace, flare, .97, 1.06, 1.2, hip_thickness, foot_thickness); - add_flag (.98 flagspace, flare, .91, 1.05, 1.2, + add_flag (.98 flagspace, flare, .93, 1.04, 1.22, hip_thickness, foot_thickness); draw_square_block ((-0.5 stemthickness_rounded, 0), (0, (-flag_count * staff_space_rounded))); y_mirror_char; +enddef; + + + + +fet_beginchar ("8th Flag (up)", "u3"); + upstemsingleflag (0.0); +fet_endchar; + + +fet_beginchar ("16th Flag (up)", "u4"); + upstemdoubleflag (0); +fet_endchar; + + +fet_beginchar ("32nd Flag (up)", "u5"); + upstemtripleflag (0); +fet_endchar; + + +fet_beginchar ("64th Flag (up)", "u6"); + upstemquadrupleflag (0); +fet_endchar; + + +fet_beginchar ("128th Flag (up)", "u7"); + upstemquintupleflag (0); fet_endchar; + + + +fet_beginchar ("8th Flag (down)", "d3"); + downstemsingleflag (0.0); +fet_endchar; + + +fet_beginchar ("16th Flag (down) 3", "d4"); + downstemdoubleflag (0); +fet_endchar; + + +fet_beginchar ("32nd Flag (down)", "d5"); + downstemtripleflag (0); +fet_endchar; + + +fet_beginchar ("64th Flag (down)", "d6"); + downstemquadrupleflag (0); +fet_endchar; + + +fet_beginchar ("128th Flag (down)", "d7"); + downstemquintupleflag (0); +fet_endchar; + + + + %%%%%%%% % -% Single Stroke for Short Appogiatura +% Single Stroke for Short Appoggiatura % fet_beginchar ("grace dash (up)", "ugrace");