2011/3/25 <[email protected]> > Could you send me the final patch for pushing? > > http://codereview.appspot.com/4273074/ >
Here they are, sorry for the delay. Janek
From 1d878568c268cb9753abda0f758939e2c990c15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janek=20Warcho=C5=82?= <[email protected]> Date: Fri, 18 Mar 2011 11:33:55 +0100 Subject: [PATCH 1/4] including blot_diameter in calculating upstem flag lengths Doing so is needed in case of 32nd flag, because after changing 32nd stem length it touches staff line. In case of 64th and 128th this isn't really needed, but i added it for consistency's sake. --- mf/feta-flags.mf | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mf/feta-flags.mf b/mf/feta-flags.mf index 104bab3..95cedb1 100644 --- a/mf/feta-flags.mf +++ b/mf/feta-flags.mf @@ -201,7 +201,7 @@ fet_beginchar ("32nd Flag (up)", "u5"); save flagspace, total_depth, flag_count; flag_count = 3; - total_depth# = 4.25 staff_space#; + total_depth# = 4.25 staff_space# - blot_diameter# / 2; flare = .85 staff_space; flagspace# = .87 staff_space#; hip_depth_ratio = .72; @@ -236,7 +236,7 @@ fet_beginchar ("64th Flag (up)", "u6"); save flagspace, total_depth, flag_count; flag_count = 4; - total_depth# = 5.25 staff_space#; + total_depth# = 5.25 staff_space# - blot_diameter# / 2; flare = .85 staff_space; flagspace# = .9 staff_space#; hip_depth_ratio = .72; @@ -273,7 +273,7 @@ fet_beginchar ("128th Flag (up)", "u7"); save flagspace, total_depth, flag_count; flag_count = 5; - total_depth# = 6.25 staff_space#; + total_depth# = 6.25 staff_space# - blot_diameter# / 2; flare = .85 staff_space; flagspace# = .93 staff_space#; hip_depth_ratio = .72; -- 1.7.0.4
From 9d973d044e94541eaaca65c825aee55176a7e9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janek=20Warcho=C5=82?= <[email protected]> Date: Fri, 18 Mar 2011 11:38:37 +0100 Subject: [PATCH 2/4] shortening of downstem 8th flag This was discussed here: http://lists.gnu.org/archive/html/lilypond-devel/2011-03/msg00128.html Not many people gave their opinions; Carl prefers not changing this, but he doesn't feel strongly about it, Werner is not sure, but feels a bit more like shortening the flag, Mike agrees to make the change. My opinion is that it should be changed. --- mf/feta-flags.mf | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mf/feta-flags.mf b/mf/feta-flags.mf index 95cedb1..68a39a7 100644 --- a/mf/feta-flags.mf +++ b/mf/feta-flags.mf @@ -312,12 +312,12 @@ fet_beginchar ("8th (down)", "d3"); save flagspace, total_depth, flag_count; flag_count = 1; - total_depth# = 2.85 staff_space#; + total_depth# = 2.75 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#; -- 1.7.0.4
From 17a3bb2a66b89f83a6d7af926424d5ccc76bbbd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janek=20Warcho=C5=82?= <[email protected]> Date: Fri, 18 Mar 2011 11:50:36 +0100 Subject: [PATCH 3/4] downstem 16th and 32nd flags touchup 32nd downstem flag is made less 'bumpy' (curves on the right edge of the flag are less pronounced, to match 64th and 128th flags better). Also, 16th and 32nd flags are made more consistent. In particular, flares are corrected so now 32nd flag isn't suddenly thicker than 16th flag. --- mf/feta-flags.mf | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mf/feta-flags.mf b/mf/feta-flags.mf index 68a39a7..7f5c14d 100644 --- a/mf/feta-flags.mf +++ b/mf/feta-flags.mf @@ -345,7 +345,7 @@ fet_beginchar ("16th (down)", "d4"); flag_count = 2; total_depth# = 3.0 staff_space# - blot_diameter# / 2; - flare = .8 staff_space; + flare = .82 staff_space; flagspace# = .9 staff_space#; hip_depth_ratio = .85; hip_width# = downflag_width# - hip_thickness# / 2; @@ -380,11 +380,11 @@ fet_beginchar ("32nd (down)", "d5"); flag_count = 3; total_depth# = 3.75 * staff_space# - blot_diameter# / 2; - flare = .84 staff_space; - flagspace# = .9 staff_space#; - hip_depth_ratio = .85; + 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,9 +399,9 @@ 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), -- 1.7.0.4
From 16f6cc4015e4ba0474055b62da7b322184be8ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janek=20Warcho=C5=82?= <[email protected]> Date: Fri, 18 Mar 2011 12:19:56 +0100 Subject: [PATCH 4/4] downstem 64th and 128th flag touchup 64th and 128th flags are made less trianglish (squeezed at the bottom), also the gap between flag and notehead is reduced. The flags look now more consistent with 16th and 32nd flags, as well as with upstem flags. --- mf/feta-flags.mf | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mf/feta-flags.mf b/mf/feta-flags.mf index 7f5c14d..891ce2c 100644 --- a/mf/feta-flags.mf +++ b/mf/feta-flags.mf @@ -416,12 +416,12 @@ fet_beginchar ("64th (down)", "d6"); save flagspace, total_depth, flag_count; flag_count = 4; - total_depth# = 4.35 staff_space#; + total_depth# = 4.5 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,11 +436,11 @@ 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), @@ -455,9 +455,9 @@ fet_beginchar ("128th (down)", "d7"); save flagspace, total_depth, flag_count; flag_count = 5; - total_depth# = 5.25 staff_space#; + total_depth# = 5.5 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,13 +475,13 @@ 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), -- 1.7.0.4
_______________________________________________ lilypond-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/lilypond-devel
