fet_begingroup("flags")
save outer_path;
path outer_path;
+
% Flags pointing down overlap with the notehead (in x-direction), so
% the down-flag can be bigger
-upflag_width# = .750 black_notehead_width# + stemthickness#/2;
+upflag_width# = .650 black_notehead_width# + stemthickness#/2;
downflag_width# = .833 black_notehead_width# + stemthickness#/2;
+right_upflag_space# = .0 upflag_width#;
+right_downflag_space# = .0 downflag_width#;
+
%
% Flags pointing down cannot overlap with the notehead in y-direction,
% so they have less slant.
-%
-% Because of optical illusion, the utmost flag
-% (bottom for down-pointing, top
-% for up-pointing) should be smaller than the other flags
+% Because of optical illusion, the utmost flag (bottom for
+% down-pointing, top for up-pointing) should be smaller than the other
+% flags. Adobe Sonata doesn't do this correctly. (Instead they have
+% an extension flag, which looks less elegant)
%
save hip_thickness, foot_thickness;
-hip_thickness# = 1.3 stemthickness#;
-foot_thickness# = hip_thickness#;
+
+hip_thickness# = 1.0 stafflinethickness# + 0.069 staff_space#;
+foot_thickness# = 1.2055 stafflinethickness# + 0.06 staff_space#;
%
% Inspired by Adobe Sonata and [Wanske]
% for example, see POSTSCRIPT Language -- program design,
% page 119, and [Wanske], p 41,42
%
-
def draw_flag(expr center, flare,
dims, hip_depth, foot_wid, hip_thickness, foot_thickness)=
clearxy;
-
+ save c ;
+ c = 0.7;
penpos1(flare, 90);
penpos2(whatever, 0);
x2r - x2l = hip_thickness;
- penpos3(foot_thickness, 0) ;
+ penpos3 (foot_thickness, -20.0);
z1r = center;
z2r = center + (xpart dims, -ypart(dims) * hip_depth);
z3r = center + (xpart(dims) * foot_wid, -ypart dims);
- outer_path := z3r{curl 0} .. z2r{up} .. {up}z1r;
+ outer_path := z3r{curl c} .. z2r{up} .. {up}z1r;
penlabels(1, 2, 3);
fill z1l{curl 0}
..tension 1.1 .. z2l{down} ..
- {curl 0} simple_serif(z3l, z3r, 80) &
+ {curl c} simple_serif(z3l, z3r, 80) &
outer_path & z1r -- cycle;
enddef;
%
-% TODO: calc intersectpoint
+% TODO: calc intersectpoint (see TeX book, p. 137)
% TODO: calc incision_depth
%
+
def add_flag(expr yoff, flare, hip_wid_multiplier,
hip_dep_multiplier,
intersectpoint, hip_thickness, foot_thickness) =
hip_depth_ratio, hip_width,
foot_depth, foot_width_ratio;
- flare# = 1.0 interline#;
+ flare# = 1.0 staff_space#;
hip_depth_ratio = .72;
foot_width_ratio = .8;
hip_width# = upflag_width# - hip_thickness#/2;
- foot_depth# = 3 interline#;
+ foot_depth# = 3 staff_space# - blot_diameter#/2;
- set_char_box(stemthickness# /2, hip_width#
- + stemthickness#/2,
+ set_char_box(0, hip_width#
+ + stemthickness#/2 + right_upflag_space#,
foot_depth# + foot_thickness#/2, stemthickness#/2)
define_pixels(flare, hip_width, hip_thickness,
foot_depth, foot_thickness);
- draw_flag((stemthickness/2,0), flare,
+ draw_flag((0,0), flare,
(hip_width, foot_depth),
hip_depth_ratio, foot_width_ratio, hip_thickness, foot_thickness);
- pickup pencircle scaled stemthickness;
- draw (0, 0) .. (0,-2 interline);
+ draw_square_block ((-.5 stemthickness,-1 staff_space),
+ (0, 0));
fet_endchar;
fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")
hip_depth_ratio, hip_width,
foot_depth, foot_width_ratio;
save flagspace, total_depth, flag_count;
- total_depth# = 3.5 interline#;
+ total_depth# = 3.5 staff_space# - blot_diameter# /2 ;
flag_count = 2;
- flare# = .85 interline#;
- flagspace# = .85 interline#;
+ flare# = .85 staff_space#;
+ flagspace# = .85 staff_space#;
hip_depth_ratio = .72 ;
hip_width# = upflag_width# - hip_thickness#/2;
flagspace# + foot_depth# = total_depth#;
foot_width_ratio = .8;
- set_char_box(stemthickness# /2, hip_width#
- + stemthickness#/2,
+ set_char_box(0, hip_width#
+ + stemthickness#/2 + right_upflag_space#,
total_depth# + foot_thickness#/2, stemthickness#/2)
define_pixels(flare, hip_width, hip_thickness,
flagspace,
foot_depth, foot_thickness);
-
- draw_flag((stemthickness/2,- flagspace), flare,
+ draw_flag((0, - flagspace ), flare,
(hip_width, foot_depth),
hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
.97, 1.00, 1.25, hip_thickness, foot_thickness);
pickup pencircle scaled stemthickness;
- draw (0, 0) .. (0,-2 interline);
+
+ draw_square_block ((-.5 stemthickness,0),
+ (0, -2 staff_space));
fet_endchar;
foot_depth, foot_width_ratio;
save flagspace, total_depth, flag_count;
flag_count = 3;
- total_depth#=4.25 interline#;
- flare# = .85 interline#;
- flagspace# = .87 interline#;
+ total_depth#=4.25 staff_space#;
+ flare# = .85 staff_space#;
+ flagspace# = .87 staff_space#;
hip_depth_ratio = .72 ;
hip_width# = upflag_width# - hip_thickness#/2;
(flag_count-1) * flagspace# + foot_depth# = total_depth#;
foot_width_ratio = .8;
- set_char_box(stemthickness# /2, hip_width#
- + stemthickness#/2,
+ set_char_box(0, hip_width#
+ + right_upflag_space#,
total_depth# + foot_thickness#/2, stemthickness#/2)
define_pixels(flare, hip_width, hip_thickness,
flagspace,
foot_depth, foot_thickness);
- draw_flag((stemthickness/2,- 2 flagspace), flare,
+ draw_flag((0,- 2 flagspace), flare,
(hip_width, foot_depth),
hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
add_flag(flagspace, flare,
.95, 1.05, 1.25, hip_thickness, foot_thickness);
- pickup pencircle scaled stemthickness;
- draw (0, 0) .. (0,-2 interline);
+
+
+ draw_square_block ((-.5 stemthickness,0),
+ (0, -3 staff_space));
fet_endchar;
fet_beginchar("64th Flag (up)", "u6", "sixtyfourthflag")
save flagspace, total_depth, flag_count;
flag_count = 4;
- flare# = .85 interline#;
- flagspace# = .9 interline#;
+ flare# = .85 staff_space#;
+ flagspace# = .9 staff_space#;
hip_depth_ratio = .72 ;
hip_width# = upflag_width# - hip_thickness#/2;
- total_depth# = 5.25 interline#;
+ total_depth# = 5.25 staff_space#;
(flag_count-1) * flagspace# + foot_depth# = total_depth#;
foot_width_ratio = .8;
- set_char_box(stemthickness# /2, hip_width#
- + stemthickness#/2,
+ set_char_box(0, hip_width#
+ + right_upflag_space#,
total_depth# + foot_thickness#/2, stemthickness#/2)
define_pixels(flare, hip_width, hip_thickness,
flagspace,
foot_depth, foot_thickness);
- draw_flag((stemthickness/2,- (flag_count-1)* flagspace), flare,
+ draw_flag((0,- (flag_count-1)* flagspace), flare,
(hip_width, foot_depth),
hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
1.00, 1.00, 1.25, hip_thickness, foot_thickness);
add_flag(flagspace, flare,
.95, 1.05, 1.25, hip_thickness, foot_thickness);
- pickup pencircle scaled stemthickness;
- draw (0, 0) .. (0,-2 interline);
+
+ draw_square_block ((-.5 stemthickness,0),
+ (0, -4 staff_space));
fet_endchar;
fet_beginchar("8th (down)", "d3", "deighthflag")
save flagspace, total_depth, flag_count;
flag_count = 1;
- flare# = .99 interline#;
- flagspace# = .9 interline#;
+ flare# = .99 staff_space#;
+ flagspace# = .9 staff_space#;
hip_depth_ratio = .72 ;
hip_width# = downflag_width# - hip_thickness#/2;
- total_depth# = 2.85 interline#;
+ total_depth# = 2.85 staff_space#;
(flag_count-1) * flagspace# + foot_depth# = total_depth#;
foot_width_ratio = .8;
- set_char_box(stemthickness# /2, hip_width#
- + stemthickness#/2,
+ set_char_box(0, hip_width#
+ + right_downflag_space#,
total_depth# + foot_thickness#/2, stemthickness#/2)
define_pixels(flare, hip_width, hip_thickness,
flagspace,
foot_depth, foot_thickness);
- draw_flag((stemthickness/2,- (flag_count-1) *flagspace), flare,
+ draw_flag((0,- (flag_count-1) *flagspace), flare,
(hip_width, foot_depth),
hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
+ draw_square_block ((-.5 stemthickness,0),
+ (0, - staff_space));
+ y_mirror_char;
+fet_endchar;
- pickup pencircle scaled stemthickness;
- draw (0, 0) .. (0,-2 interline);
+%%%%%%%%
+%
+%
+%
+% Single Stroke for Short Appogiatura
+%
+%
+%
+
+fet_beginchar("grace dash (up)", "ugrace", "gracedash")
+ save flare,
+ hip_depth_ratio, hip_width,
+ foot_depth;
+
+ flare# = 1.0 staff_space#;
+ hip_depth_ratio = .72;
+ hip_width# = upflag_width# - hip_thickness#/2;
+
+ foot_depth# = 3 staff_space#;
+
+ define_pixels(flare, hip_width, hip_thickness,
+ foot_depth, foot_thickness);
+
+ set_char_box(hip_width# * hip_depth_ratio,
+ hip_width# + right_upflag_space#,
+ foot_depth# * hip_depth_ratio, -flare#)
+
+ pickup pencircle scaled 1.5 stemthickness;
+ draw (-b ,-d) ..
+ (w, h);
+
+fet_endchar;
+
+fet_beginchar("grace dash (down)", "dgrace", "dgracedash")
+ save flare, hip_depth_ratio, hip_width, foot_depth;
+ save flagspace, total_depth, flag_count;
+
+ flag_count = 1;
+ flare# = .99 staff_space#;
+ flagspace# = .9 staff_space#;
+ hip_depth_ratio = .72 ;
+ hip_width# = downflag_width# - hip_thickness#/2;
+ total_depth# = 2.85 staff_space#;
+ (flag_count-1) * flagspace# + foot_depth# = total_depth#;
+
+ foot_width_ratio = .8;
+
+ define_pixels(flare, hip_width, hip_thickness,
+ flagspace, foot_depth);
+
+ set_char_box(hip_width# * hip_depth_ratio,
+ hip_width# + right_downflag_space#,
+ foot_depth# * hip_depth_ratio, -flare#)
+
+ pickup pencircle scaled 1.5 stemthickness;
+ draw (-b ,-d) ..
+ (w, h);
y_mirror_char;
fet_endchar;
save flagspace, total_depth, flag_count;
flag_count = 2;
- flare# = .8 interline#;
- flagspace# = .9 interline#;
+ flare# = .8 staff_space#;
+ flagspace# = .9 staff_space#;
hip_depth_ratio = .85 ;
hip_width# = downflag_width# - hip_thickness#/2;
- total_depth# = 3.0 interline#;
+ total_depth# = 3.0 staff_space# - blot_diameter# /2;
(flag_count-1) * flagspace# + foot_depth# = total_depth#;
foot_width_ratio = .95;
- set_char_box(stemthickness# /2, hip_width#
- + stemthickness#/2,
+ set_char_box(0, hip_width#
+ + right_downflag_space#,
total_depth# + foot_thickness#/2, stemthickness#/2)
define_pixels(flare, hip_width, hip_thickness,
flagspace,
foot_depth, foot_thickness);
- draw_flag((stemthickness/2,- (flag_count-1) *flagspace), flare,
+ draw_flag((0,- (flag_count-1) *flagspace), flare,
(hip_width, foot_depth),
hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
add_flag(flagspace, flare,
.95, 1.00, 1.25, hip_thickness, foot_thickness);
+ draw_square_block ((-.5 stemthickness,0),
+ (0, - 2 staff_space));
+
- pickup pencircle scaled stemthickness;
- draw (0, 0) .. (0,-2 interline);
y_mirror_char;
fet_endchar;
save flagspace, total_depth, flag_count;
flag_count = 3;
- flare# = .84 interline#;
- flagspace# = .9 interline#;
+ flare# = .84 staff_space#;
+ flagspace# = .9 staff_space#;
hip_depth_ratio = .85 ;
hip_width# = downflag_width# - hip_thickness#/2;
- total_depth# = 3.85 interline#;
+ total_depth# = 3.85 staff_space#;
(flag_count-1) * flagspace# + foot_depth# = total_depth#;
foot_width_ratio = .95;
- set_char_box(stemthickness# /2, hip_width#
- + stemthickness#/2,
+ set_char_box(0, hip_width#
+ + right_downflag_space#,
total_depth# + foot_thickness#/2, stemthickness#/2)
define_pixels(flare, hip_width, hip_thickness,
flagspace,
foot_depth, foot_thickness);
- draw_flag((stemthickness/2,- (flag_count-1) *flagspace), flare,
+ draw_flag((0,- (flag_count-1) *flagspace), flare,
(hip_width, foot_depth),
hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
add_flag(flagspace, flare,
add_flag(flagspace, flare,
.95, 1.05, 1.25, hip_thickness, foot_thickness);
+ draw_square_block ((-.5 stemthickness,0),
+ (0, - 3 staff_space));
-
- pickup pencircle scaled stemthickness;
- draw (0, 0) .. (0,-2 interline);
y_mirror_char;
fet_endchar;
fet_beginchar("64th (down)", "d6", "dsixtyfourthflag")
save flagspace, total_depth, flag_count;
flag_count = 4;
- flare# = .8 interline#;
- flagspace# = .9 interline#;
+ flare# = .8 staff_space#;
+ flagspace# = .9 staff_space#;
hip_depth_ratio = .85 ;
hip_width# = downflag_width# - hip_thickness#/2;
- total_depth# = 4.35 interline#;
+ total_depth# = 4.35 staff_space#;
(flag_count-1) * flagspace# + foot_depth# = total_depth#;
foot_width_ratio = .98;
- set_char_box(stemthickness# /2, hip_width#
- + stemthickness#/2,
+ set_char_box(0, hip_width#
+ + right_downflag_space#,
total_depth# + foot_thickness#/2, stemthickness#/2)
define_pixels(flare, hip_width, hip_thickness,
flagspace,
foot_depth, foot_thickness);
- draw_flag((stemthickness/2,- (flag_count-1) *flagspace), flare,
+ draw_flag((0,- (flag_count-1) *flagspace), flare,
(hip_width, foot_depth),
hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
add_flag(flagspace, flare,
add_flag(flagspace, flare,
.97, 1.10, 1.175, hip_thickness, foot_thickness);
- add_flag(flagspace, flare,
- .95, 1.03, 1.175, hip_thickness, foot_thickness);
+ add_flag(.98 flagspace, flare,
+ .91, 1.05, 1.2, hip_thickness, foot_thickness);
-
+ draw_square_block ((-.5 stemthickness,0),
+ (0, - 4 staff_space));
- pickup pencircle scaled stemthickness;
- draw (0, 0) .. (0,-2 interline);
y_mirror_char;
fet_endchar;
+
+
+
fet_endgroup("flags");
projects / lilypond.git / blobdiff