% source file of the Feta (Font-En-Tja) music font
%
% (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>,
-% Jan Nieuwenhuizen <jan@digicash.com>
+% Jan Nieuwenhuizen <janneke@gnu.org>
-fet_begingroup("klef");
+
+
+
+fet_begingroup("clefs");
+
+%
+% [Ross] says that clefs take 1 interline space on the left and right
+%
+def set_horizontal_spacing =
+ save left_space ,right_space;
+ left_space# = reduced_il#;
+ right_space# = reduced_il#;
+enddef;
def draw_staff(expr first, last)=
pickup pencircle scaled stafflinethickness;
endfor
enddef;
+% [Wanske] says the bulbs should be positioned about 1/4 right of the
+% "arrow"
def draw_c_clef (expr reduction) =
- save hair, norm, reduced_il;
+ save hair, norm, reduced_il, right_edge;
reduced_il#=interline#*reduction;
norm#:=2/3reduced_il#;
hair#:=1/6norm#;
- define_pixels (hair,norm,reduced_il);
- set_char_box (0, 11/4interline#, 2 reduced_il#, 2 reduced_il#);
- % huh, what's y-zero?
- draw_block ((0,-d), (1/2reduced_il,h));
- draw_block ((1/2reduced_il+stafflinethickness,-d),
- (1/2reduced_il+2stafflinethickness,h));
+
+ set_horizontal_spacing;
+ right_edge# = 15/4norm#+2hair#;
+
+ set_char_box (left_space#, right_edge# + right_space#,
+ 2 reduced_il#, 2 reduced_il#);
+ define_pixels (hair,norm,reduced_il, right_edge);
+
+ draw_block ((0,-d), (3/4norm+1/2hair,h));
+ draw_block ((3/4norm+2hair,-d),
+ (3/4norm+7/2hair,h));
save xoff;
- xoff=1/2reduced_il+2hair;
+ xoff=3/4norm+7/2hair;
penpos1(hair,-90);
- z1l=(xoff+norm+hair/2,h);
- penpos2(norm-hair,180);
- z2l=(w,h/2);
+ z1l=(xoff+norm+hair,h);
+ penpos2(norm-3/2hair,180);
+ z2l=(right_edge,h/2);
penpos3(hair,90);
- z3=(((w-xoff)/2)+xoff,2hair);
- penpos4(hair,90);
- z4=(xoff+hair+1/2norm+hair,y3);
+ z3=(((right_edge -xoff)/2)+xoff,2hair);
+
+ penpos4(hair,0);
+ z4=(xoff+1/2norm+1/2hair,reduced_il-hair);
+
+ penpos5(4hair,0);
+ z5=(xoff+5/4hair,0);
- penpos6(hair,-90);
- z6r=(xoff+norm+hair,-d);
+ penpos6(norm-hair,90);
+ z6=(xoff+3/4norm,0);
+
+ penpos7(hair,-90);
+ z7r=(x1,-d);
save t; t=0.833;
save p; path p;
- p = z4r{right}..z3r{right}..tension t..z2r{up}
- ..z1r{left}..z1l{right}..z2l{down}
- ..z3l{left}..z4l{left};
+ p = z5l..z4l{up}..z4r{down}..z3r{right}..tension t..z2r{up}
+ ..tension t..z1r{left}..z1l{right}..tension t..z2l{down}
+ ..z3l{left}..z6r..z5r{down};
pickup pencircle scaled 1pt#;
- % boehoe, howto?
-% draw p..(p yscaled -1)..cycle;
- fill p..cycle;
- fill (p yscaled -1)..cycle;
- penlabels (1,2,3,4);
-
- % ugh, should be bulb, not flare
- draw_flare(z1l,180,90,hair,norm);
- draw_flare(z6r,180,-90,hair,norm+hair);
+ filldraw p..(reverse p yscaled -1)..cycle;
+ penlabels (1,2,3,4,5,6);
+
+ % ugh, should be bulb, not flare?
+ draw_flare(z1l,180,90,hair,norm-1/2hair);
+ draw_flare(z7r,180,-90,hair,norm-1/2hair);
enddef;
-fet_beginchar ("C clef", "ugh_alto", "ugh_altoclef")
+fet_beginchar ("C clef", "alto", "altoclef")
if test = 1:
- draw_staff (-1,3);
+ draw_staff (-2,2);
fi;
draw_c_clef (1.0);
fet_endchar;
-fet_beginchar ("C clef", "ugh_alto_change", "ugh_caltoclef")
+fet_beginchar ("C clef", "alto_change", "caltoclef")
+ if test = 1:
+ draw_staff (-2,2);
+ fi;
draw_c_clef (.8);
fet_endchar;
% the dots, but her picture shows that the extreme is ~ 0.2 ss lower
def draw_bass_klef(expr exact_center, reduction) =
- save reduced_il, left_tilt, left_thick;
+ save reduced_il, left_tilt, left_thick, ball_to_right;
reduced_il# = interline# * reduction;
- left_tilt = 5;
- define_pixels(reduced_il);
- left_thick = .25 reduced_il;
- set_char_box(
- - xpart exact_center+ .2 reduced_il#,
- xpart exact_center + 2.7 reduced_il#,
+ set_horizontal_spacing;
+ ball_to_right# = 2.1 reduced_il#;
+ set_char_box(left_space# +
+ - xpart exact_center,
+ right_space# +
+ xpart exact_center + ball_to_right#,
- ypart exact_center + 2.5 reduced_il#,
ypart exact_center +reduced_il#);
+
+ define_pixels(reduced_il, ball_to_right);
+ left_tilt = 5;
+ left_thick = .25 reduced_il;
+
x1r - x1l = left_thick;
z1l = (hround_pixels(xpart exact_center),
vround_pixels(ypart exact_center));
y2 = reduced_il;
- x3l - x1l = 2.1 reduced_il;
+ x3l - x1l = ball_to_right;
x2 = .5 [x1,x3];
x3l - x3r = .48 reduced_il;
y3l = -0.05 interline;
labels(2,4);
penlabels(1,2,3,4);
- pickup pencircle scaled (.35 reduced_il);
+ save dot_diam;
+ 2 dot_diam = reduction* (interline - stafflinethickness);
+ pickup pencircle scaled dot_diam;
draw z5;
draw z5 yscaled -1;
enddef;
%
% Inspired by Baerenreiter
%
-% FIXME top should be thinner at z8,
% FIXME bulb should curve (see bass clef)
% FIXME start (inside) should be little thinner
% FIXME parametrise.
-% FIXME should be a bit more upright
%
% Beste lezers, kijk,
downstroke_dir = (14, -75);
breapth_factor = 11/7;
inner_thick_end = 45;
- inner_start_angle = angle(-1,-2);
+ inner_start_angle = downstroke_angle - 43;
thickness = .4 reduced_il - hair;
thinnib = thinness - hair;
thinpen = thinness;
- set_char_box(-xpart exact_center + breapth_factor* reduced_il#,
+ set_horizontal_spacing;
+
+ set_char_box(
+ left_space# +
+ -xpart exact_center + 1.0 * breapth_factor* reduced_il#,
+ right_space# +
xpart exact_center + .66 breapth_factor* reduced_il#,
-ypart exact_center + 3 * reduced_il#,
ypart exact_center + 5 * reduced_il#);
pickup pencircle scaled hair;
-
downstroke_angle = angle downstroke_dir;
- z1 = center + whatever * dir inner_start_angle;
+
+ z1 = center + whatever * dir (inner_start_angle);
x1 = xpart center -.28 reduced_il;
top z2r = center + (0,reduced_il + stafflinethickness/2);
center - z10= whatever * downstroke_dir;
center - z11 = whatever * downstroke_dir;
-
+ center - z14 = .8 (center - z11);
penpos1(thinnib, inner_start_angle);
penpos2(thickness, 90);
penpos3(thinnib, -90 + inner_thick_end);
penpos7(thickness, 135);
penpos8(1.5 thinnib, - 70 + angle downstroke_dir);
- penpos9(1.5 thickness, -80);
+ penpos9(1.4 thickness, -80); % ugh
penpos10(whatever, downstroke_angle + 10);
penpos11(thinnib, downstroke_angle + 90);
+ penpos14(thinnib, downstroke_angle + 90);
penpos12(thinnib, -90);
penpos13(3 thinnib, 180);
-
filldraw z2l{right} .. z3l.. z4l{left} .. z5l{up} .. z7l{up}
%.. z8l
+ .. tension 1.2
.. z9l & z9l ..
{downstroke_dir}z10l --- z11l -- z11r --- z10r{- downstroke_dir}
.. tension .8
- .. z9r & z9r
+ .. z9r & z9r{dir (downstroke_angle+ 40)} % ugh
%.. z8r
.. z7r{down} .. z5r{down} .. z4r{right}
.. z3r .. z2r{left} ..
draw_bulb(-1, z13l, lft z13r, 6/14 reduced_il, 1.0);
pickup pencircle scaled (thinpen);
- draw z10 --- z11 .. z12{left};
+ draw z10 --- z14 .. z11 .. tension 0.85 .. z12{left};
penlabels(range 1 thru 15);
enddef;
if test = 1:
draw_staff(-1,3);
fi;
- draw_gclef((1.6 interline#,0), 1.0);
+ draw_gclef((1.7 interline#,0), 1.0);
fet_endchar;
fet_beginchar("G clef", "violin_change", "cviolinclef")
draw_gclef((1.3 interline#,0), .8);
fet_endchar;
-fet_endgroup("klef");
+fet_endgroup("clefs");
projects / lilypond.git / blobdiff