]> git.donarmstrong.com Git - lilypond.git/blobdiff - mf/feta-bolletjes.mf
(code): remove tex name from fet_beginchar.
[lilypond.git] / mf / feta-bolletjes.mf
index 3aac7752a9f2e12a563bb7de9a445f557c02b4f3..c1e19bcb6378ae0d596517833b483be227b66b86 100644 (file)
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1997, 1998 Jan Nieuwenhuizen <janneke@gnu.org>
-% & Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% & Juergen Reuter <reuter@ipd.uka.de>
 % 
 
+test_outlines := 0;
+
 
 % most beautiful noteheads are pronounced, not circular, 
 % and not even symmetric.
 % These examples are inspired by [Wanske], see literature list
 
 
-save black_notehead_width;
-numeric black_notehead_width;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% NOTE HEAD VARIABLES
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+save black_notehead_width, noteheight,
+       slash_thick, slash_slope, overdone_heads;
+numeric black_notehead_width, noteheight, slash_thick;
+
 
 fet_begingroup("noteheads");
 
-noteheight#:=interline#+ (1 + overdone_heads) *stafflinethickness#;
-define_pixels(noteheight);
-brevis_wid# := 2 interline#;
 
-def draw_brevis(expr brevwid) =
-       save beamheight, head_width;
-       save holeheight, stem_width;
-       save serif_size, serif_protrude;
 
-       head_width# = brevwid;
-       holeheight = 3 stafflinethickness;
-       stem_width = 1.4 stafflinethickness;
+% slope of slash. From scm/grob-description.scm. How to auto-copy?
+slash_slope := 1.7; 
+
+% thickness of slash lines. quarter notes get 1.5slt width.
+slash_thick# := 2/3*0.48staff_space#;
+
+
+%
+% Hand-engraved music often has balls extending above and below
+% the lines.  If you like that, modify overdone heads (unit:
+% stafflinethickness)
+%
+overdone_heads = 0.0;
+noteheight#:=staff_space#+ (1 + overdone_heads) *stafflinethickness#;
+
+define_pixels(slash_thick, noteheight);
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% SLANT moves both extremes on the long axis (by SLANT * ELLIPTICITY,
+% so SLANT = -1, puts the extreme on the long axis next to the short axis one.)
+%
+
+def draw_outside_ellipse (expr ellipticity, tilt, superness,
+                         slant) =
+       save attachment_y;
+       save p;
+       path p;
+
+       p := superellipse ((ellipticity, 0), (-slant * ellipticity, 1.0),
+                       (- ellipticity, 0), (slant * ellipticity, -1.0), superness);
+
+       p := p rotated tilt;
+
+       save top_point, right_point;
+       pair top_point, right_point;
 
+       top_point := directionpoint left of p;
+       right_point := directionpoint up of p;
 
-       define_pixels(head_width);
-       set_char_box(0, head_width#, noteheight#/2, noteheight#/2);
+       save scaling, width, height;
+
+       scaling# = noteheight# /(2 ypart (top_point));
+       width# := 2 xpart (right_point) * scaling#;
+
+       define_pixels (width, scaling);
        
-       2 beamheight + holeheight = noteheight;
-       serif_size = (holeheight - stafflinethickness)/2;
-       serif_protrude = 1.5 serif_size;
-       penpos1(stem_width, 0);
-       penpos2(stem_width, 0);
-       penpos3(beamheight, 90);
-       penpos4(beamheight, 90);
-       penpos5(stem_width, 180);
-
-       z1l = (0, 0);
-       z2l = (0, -stafflinethickness/2);
-       z3r = z2r + serif_size *(1,-1);
-       y4r = y3r;
-       x4r = head_width/2;
-       z5l = z3l + (-serif_size, -serif_protrude);
-
-       penlabels(1,2,3,4, 5);
-       fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right}
-               -- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle;
-
-       addto currentpicture also currentpicture yscaled -1;
-       show z4r; show z4l;
-       addto currentpicture also currentpicture 
-               shifted (-x4r,0) xscaled -1 shifted (x4l,0);
+       set_char_box (0, width#, noteheight#/2, noteheight#/2);
+
+       % attachment Y
+       charwy := ypart (right_point) * scaling#;
+       charwx := width# ;
+
+       p := p scaled scaling shifted (width/2, 0) ;
+       if test_outlines = 1:
+               pickup pencircle scaled 1 ; draw p;
+       else:
+               fill p;
+       fi;
+enddef;
+
+
+def undraw_inside_ellipse (expr ellipticity, tilt, superness, clearance,
+                       center) =
+begingroup
+       save p;
+       path p;
+
+       p := superellipse ((ellipticity, 0), (0, 1.0),
+                       (- ellipticity, 0), (0, -1.0), superness);
+
+       p := p rotated tilt;
+
+       save top_point, right_point;
+       pair top_point, right_point;
+
+       top_point := directionpoint left of p;
+       right_point := directionpoint up of p;
 
+       save height, scaling;
+
+       height# = staff_space# + stafflinethickness# - clearance;
+       scaling# = height# /(2 ypart (top_point));
+
+       define_pixels (scaling);
+       p := (p scaled scaling) shifted center;
+
+       if test_outlines = 1:
+               pickup pencircle scaled 1; draw p;
+       else:
+               unfill p;
+       fi
+endgroup;
 enddef;
 
-save uitsteek;
- uitsteek = .25;
-def draw_ledger(expr wid)=     
-       set_char_box(uitsteek * wid, (1+ uitsteek)*wid, 
-               ledgerlinethickness#/2,ledgerlinethickness#/2);
-       pickup pencircle scaled ledgerlinethickness;
-       rt x2 = w;
-       lft x1 = -b;
-       y1 = y2 = 0;
-       draw z1 .. z2;
+
+
+
+
+%
+% dimensions aren't entirely right.
+%
+fet_beginchar ("Brevis notehead", "s-1");
+       save stemthick, fudge;
+       define_pixels (stemthick);
+       fudge = blot_diameter / 2;
+       stemthick# = 2 stafflinethickness#;
+
+       draw_outside_ellipse (1.80, 0, 0.707, 0);
+       undraw_inside_ellipse (1.30, 125, 0.68, 2 stafflinethickness#,
+                               (w /2, 0));
+
+       pickup pencircle scaled stemthick;
+
+       bot y1 = -d;
+       top y2 = h;
+       rt x1 - fudge = 0;
+       x1 = x2;
+
+       fudge + lft x3 = w;
+       x4 = x3;
+       y4 = y2;
+       y3 = y1;
+
+       draw_gridline(z1,z2,stemthick);
+       draw_gridline(z3,z4,stemthick);
+
+fet_endchar;
+
+
+
+fet_beginchar("Whole notehead", "s0")
+       draw_outside_ellipse (1.80 - puff_up_factor / 3.0, 0, 0.707, 0);
+       undraw_inside_ellipse (1.30, 125 - puff_up_factor *10,
+                       0.68, 2 stafflinethickness#,
+                       (w /2, 0));
+
+%      draw_staff_outline (-2, 2, 0.5);
+
+fet_endchar;
+
+
+fet_beginchar("Half notehead", "s1")
+       draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, 0.66, 0.17);
+       undraw_inside_ellipse (3.25, 33, 0.81,
+               2.5 stafflinethickness#, (w/2, 0));
+
+fet_endchar;
+       
+fet_beginchar("Quart notehead", "s2")
+
+       % used to have 32. With 31, they are slightly bolder.
+       draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31, 0.707, 0);
+       black_notehead_width# := charwd;
+fet_endchar;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+fet_beginchar("Whole diamondhead", "s0diamond")
+       draw_outside_ellipse (1.80, 0, 0.495, 0);
+       undraw_inside_ellipse (1.30, 125, 0.6,
+                       .4 staff_space# +  stafflinethickness#,
+                               (w /2, 0));
+
+fet_endchar;
+
+fet_beginchar("Half diamondhead", "s1diamond")
+
+       draw_outside_ellipse (1.50, 34, 0.49, 0.17);
+       undraw_inside_ellipse (3.5, 33, 0.80,
+               .3 staff_space# + 1.5 stafflinethickness#, (w/2, 0));
+
+fet_endchar;
+
+fet_beginchar("Quart diamondhead", "s2diamond")
+       draw_outside_ellipse (1.80, 35, 0.495, -0.25);
+fet_endchar;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+
+
+def define_triangle_shape(expr stemdir) =
+       save triangle,kern; path triangle;
+       save width, depth, height;
+       save left_point, height, width, origin;
+       save left_up_dir, exact_right_point, exact_down_point;
+       pair exact_down_point, exact_left_point, origin, left_up_dir, exact_right_point;
+       save pen_thick;
+
+       pen_thick# = stafflinethickness#  + .1 staff_space#;
+       define_pixels(pen_thick, llap);
+
+       left_up_dir = llap# * dir (90 + tilt);
+
+       xpart (left_up_dir) * xs - (pen_thick# * xs)/2 + xpart origin = 0;
+       ypart origin = 0;
+
+       exact_left_point := origin + (left_up_dir xscaled xs);
+       exact_down_point := origin + (left_up_dir rotated 120 xscaled xs);
+       exact_right_point := origin + (left_up_dir rotated 240 xscaled xs);
+
+       height# = ypart (exact_left_point + origin) + pen_thick#/2;
+       depth# = -ypart (exact_down_point + origin) + pen_thick#/2;
+       width# = xpart (exact_right_point - exact_left_point) + pen_thick# * xs;
+
+       set_char_box(0, width#, depth#, height#);
+       
+       z0 = (hround_pixels (xpart origin), 0);
+       z1 = z0 + llap * dir(90+tilt) xscaled xs;  
+       z2 = z0 + (llap * dir(90+tilt + 120) xscaled xs);
+       z3 = z0 + (llap * dir(90+tilt + 240) xscaled xs);
+
+       z12 = caveness[.5[z1,z2],z3];
+       z23 = caveness[.5[z2,z3],z1];
+       z31 = caveness[.5[z3,z1],z2];
+
+       triangle = z1 .. z12 .. z2 ..
+                   z2 .. z23 .. z3 ..
+                   z3 .. z31 .. z1 ..
+                   cycle;
+       pickup pencircle scaled pen_thick xscaled xs;
+       labels(1,2,12,23,31,3);
+
+
+       % attachment Y
+       if stemdir = 1:
+               charwy := ypart exact_right_point;
+               charwx := xpart exact_right_point;
+       else:
+               charwy := - ypart exact_down_point;
+               charwx := (width# - xpart exact_down_point);
+       fi
 enddef;
 
-fet_beginchar("Ledger ending", "ledgerending", "ledgerending")
-set_char_box (5/2 ledgerlinethickness#, 5/2 ledgerlinethickness#,
-               ledgerlinethickness#/2,ledgerlinethickness#/2);
-        pickup pencircle scaled ledgerlinethickness;
-       lft x1 = -b;
-       rt x2 = w;
-       y1 =0; y2 =0;
-       draw z1 .. z2;
+fet_beginchar("Whole trianglehead", "0triangle")
+       save hei,xs;
+       save llap;
+       save tilt;
+
+       tilt = 40;
+       llap# = 3/4noteheight#;
+
+       xs = 1.5;
+       caveness:=0.1;
+       define_triangle_shape(1);
+       draw triangle;
+fet_endchar;
+
+
+def draw_closed_triangle_head(expr dir) =
+       save hei,xs;
+       save llap;
+       save tilt;
+
+       tilt = 40;
+       llap# = 2/3noteheight#;
+       xs = 1.2;
+       caveness:=0.1;
+       define_triangle_shape(dir);
+       draw triangle;
+enddef;
+
+fet_beginchar("Half trianglehead", "d1triangle")
+       draw_closed_triangle_head(-1);
 fet_endchar;
 
-fet_beginchar("Brevis notehead", "-1", "brevisball")
-       draw_brevis(brevis_wid#);
+fet_beginchar("Half trianglehead", "u1triangle")
+       draw_closed_triangle_head(1);
+fet_endchar;
+
+def draw_closed_triangle_head(expr dir) = 
+       save hei,xs;
+       save llap;
+       save tilt;
+       tilt = 40;
+       llap# = 2/3noteheight#;
+       xs = 1.0;
+       caveness:=0.1;
+       define_triangle_shape(dir);
+       filldraw triangle;
+enddef;
+
+fet_beginchar("Quart trianglehead", "u2triangle")
+       draw_closed_triangle_head(1);
 fet_endchar;
 
+fet_beginchar("Quart trianglehead", "d2triangle")
+       draw_closed_triangle_head(-1);
+fet_endchar;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% Some sources (eg Musix/OpusTeX think that the appendage should be on
-% the right, my only other ref [Willemze], shows an appendage to the left
+% slash heads are for indicating improvisation. They are  
+% twice as high as normal heads.
 %
-fet_beginchar("Longa notehead", "-2", "longaball");
-       draw_brevis(brevis_wid#);
-       save theta;
-       z7 = z5;
-       z6 - z7 = (-stem_width/2, -interline);
-       theta = angle(z6-z7)+ 90;
-       penpos7(stem_width, theta);
-       penpos6(1.2 stem_width, theta);
+def draw_slash(expr hwid_hash) =
+       save exact_height;
+       save ne_dir;
+       pair ne_dir;
+       exact_height =  staff_space# + stafflinethickness#/2;
+
+       set_char_box (0, 2 exact_height / slash_slope + hwid_hash,
+                       exact_height, exact_height);
+
+       charwx := charwd;
+       charwy := charht;
+
+       clearxy;
+       pickup pencircle scaled blot_diameter;
+
+       bot y1 = - d;
+       top y2 = h;
+       lft x1 = 0;
+       lft x2 = 2 h / slash_slope;
        
-       fill z7r .. z6r{z6-z7} .. {z7-z6} z6l -- z7l -- cycle;
-       penlabels(6,7);
-fet_endchar;
-
-
-% setup user vars
-def setup_notehead_vars =
-       save a_b,err_y_a,tilt,superness;
-       save ai_a,ai_bi,err_y_ai,err_x_bi,inner_tilt,inner_superness;
-       save b_h,a_w;
-       enddef;
-
-% setup addititional vars and calc them
-def notehead_calc =
-       save a,beta,ai,bi, ht, wd;
-       ht# =noteheight#;
-       2beta#=ht#*b_h;
-       a# = beta#*a_b;
-       wd# = 2a# / a_w;
-       ai# = a# * ai_a;
-       bi# = ai#/ai_bi;
-       define_pixels(a,beta);
-       define_pixels(ai,bi);
-       set_char_box(0, wd#, .5 ht#, .5 ht#);
-       enddef;
-
-
-% draw the outer and inner ellipse.
-def notehead_draw =
-       path black,white;
-       black=distorted_ellipse(a,beta,a*err_y_a,0,superness);
-       white=distorted_ellipse(ai,bi,ai*err_y_ai,bi*err_x_bi,inner_superness);
-if test>1: %fixme
-               save x;
-               x1=-x3=a; x2=x4=0; y1=y3=0; y2=-y4=b;
-               penlabels(1,2,3,4);
-               test_grid;
-else:
-               black:=black rotated tilt;
-               black:=black shifted (w/2,0);
-               white:=white rotated inner_tilt;
-               white:=white shifted (w/2,0);
-fi
-               fill black;
-               unfill white;
-
-               
-       enddef;
-
-% whole note
-% Wanske, p.38
-fet_beginchar("Whole notehead", "0", "wholeball")
-       setup_notehead_vars;
+       rt x3 = w;
+       y3 = y2;
+       y4 = y1;
+       x3- x2 = x4 - x1;
+
+       ne_dir := unitvector( z3  - z4);
+       filldraw z1 --- z2 --- z3 --- z4 --- cycle;
+
+       if hwid_hash > 2 slash_thick#:
+               save th;
+
+               th = slash_thick - blot_diameter;
+               y6 = y7;
+               y5 = y8;
+               y3 - y7 = th;
+               y5 - y1 = th;
+               z6 - z5 = whatever * ne_dir;
+               z8 - z7 = whatever * ne_dir;
+
+               z5  = z1 + whatever * ne_dir + th * (ne_dir rotated -90);
+               z8  = z4 + whatever * ne_dir + th * (ne_dir rotated 90);
+
+               unfill
+                       z5 -- z6 -- z7 -- z8 -- cycle;
+       fi
+       labels (range 1 thru 10);
+enddef;
+
+fet_beginchar("Whole slashhead","s0slash")
+       draw_slash(4 slash_thick# + 0.5 staff_space#);
+fet_endchar;
+
+fet_beginchar("Half slashhead","s1slash")
+       draw_slash(3.0 slash_thick# + 0.15 staff_space#);
+fet_endchar;
+
+fet_beginchar("Quart slashhead","s2slash")
+       draw_slash(1.5 slash_thick#);
+fet_endchar;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% thick is the distance between the NE/SW parallel lines in the cross
+% (distance between centres of lines)
+% in stafflinethickness def
+%
+def draw_cross(expr thick) =
+       save pent, slant, ne_dir;
+       pair ne_dir;
+       save crz; path crz;
+
+       pen_thick# := 1.2 stafflinethickness#;
+       define_pixels (pen_thick);
+       pickup pencircle scaled pen_thick;
+
+       top y3 = h;
+       ne_dir := unitvector ((1, (2 h -pen_thick)/(w - pen_thick)));
+       rt x4 = w/2;
+       y5 = 0;
+       z4 - z5 = whatever * ne_dir;
+       x6 = 0;
+       z6 - z3 = whatever * ne_dir;
+       z3 - z4 = whatever * (ne_dir yscaled -1);
+
+       z4 - z3 = whatever * (ne_dir) + (ne_dir rotated -90) * thick * stafflinethickness;
+
+       x1 = charwd/2 - .5 pen_thick#;
+       z1 = whatever * ne_dir + thick/2 * stafflinethickness# * (ne_dir rotated -90);
+
        
-       a_b:=1.80;
-       err_y_a:=0; % no slant
-       tilt:=0;
-       superness:=0.707;
-       ai_a:=0.508;
-       % ai_bi:=1.23;
-       ai_bi:=1.30; % jcn
-       % err_y_ai:=0.0938;
-       % err_x_bi:=0;
-       err_y_ai:=0;
-       err_x_bi:=0.115;
-       % inner_tilt:=135;
-       inner_tilt:=125; % jcn
-       % inner_superness:=0.69;
-       inner_superness:=0.68; % jcn
-       b_h:=1; %no rotate-> no height correction
-       a_w:=1; % no rotate-> no width correction
-
-       notehead_calc;
-       whole_notehead_width# := wd#;
-       notehead_draw;
-fet_endchar;
-
-
-
-% half note
-% Wanske, p.39
-fet_beginchar("Half notehead", "1", 
-       "halfball")
-       setup_notehead_vars;
-               % a_b:=1.49; % after text
-       a_b:=1.50; % after drawing
-       err_y_a:=0.157;
-       tilt:=34;
-       % superness:=0.66;
-       superness:=0.67; % jcn
-       % ai_a:=0.863;
-       ai_a:=0.850; % jcn
-       % ai_bi:=3.14;
-       ai_bi:=3.30; % jcn
-       err_y_ai:=0;
-       err_x_bi:=-0.12;
-       inner_tilt:=tilt;
-       inner_superness:=0.80;
-       b_h:=0.935;
-       a_w:=1.12;
-
-       notehead_calc;
-       half_notehead_width# := wd#;
-       notehead_draw;
-fet_endchar;
-
-
-
-% quarter note
-% Wanske p.38
-fet_beginchar("Quart notehead", "2", "quartball")
-       setup_notehead_vars;
-       % a_b:=1.57; % after text
-       a_b:=1.54; % after drawing
-       err_y_a:=0.044;
-       tilt:=32;
-       superness:=0.707;
-       ai_a:=0;
-       ai_bi:=1;
-       err_y_ai:=0;
-       err_x_bi:=0;
-       inner_tilt:=0;
-       inner_superness:=0.707;
-       b_h:=0.85;
-       a_w:=1.09;
-
-       notehead_calc;
-       black_notehead_width# := wd#;
-       notehead_draw;
-fet_endchar;
-
-
-
-
-
-%if test = 0:
-%else:
-def draw_harmonic_notehead(expr harmwid) =
-       save beamheight, head_width, head_char_width;
-       save holeheight, stem_width;
-       save serif_size, serif_protrude;
-       save stemthick;
-       save thin, thick;
-       save ht, schuif_op;
+       labels (1,2,3,4,5,6);
+
+       crz = (z6 -- z3 -- z4 -- z5) ;
+
+       draw crz shifted(w/2,0);
+       draw crz xscaled -1 shifted(w/2,0);
+       draw crz yscaled -1 shifted(w/2,0);
+       draw crz scaled -1 shifted(w/2,0);
+
+       charwx := charwd;
+       charwy := y1;
+       z12 = (charwx * hppp, y1 * vppp);
+       labels (12);
+enddef;
+
+fet_beginchar("Whole Crossed notehead", "s0cross")
+       wid# := black_notehead_width#+4stafflinethickness#;
+       hei# := noteheight#+stafflinethickness#;
+       set_char_box(0, wid#,hei#/2,hei#/2);
        
-%      setup_notehead_vars;
+       draw_cross (3.75);
+fet_endchar;
+
+fet_beginchar("Half Crossed notehead", "s1cross")
+       wid# := black_notehead_width#+2 stafflinethickness#;
+       hei# := noteheight#+stafflinethickness#/2;
+       set_char_box(0, wid#,hei#/2,hei#/2);
+       draw_cross(3.0);
+fet_endchar;
+
+fet_beginchar("Crossed notehead", "s2cross")
+       wid# := black_notehead_width#;
+       hei# := noteheight#;
+       set_char_box(0, wid#,hei#/2,hei#/2);
+       draw_cross(1.0);
+fet_endchar;
+
+fet_beginchar("X-Circled notehead", "s2xcircle")
+       wid# := black_notehead_width#*sqrt(sqrt2);
+       hei# := noteheight#*sqrt(sqrt2);
+       set_char_box(0, wid#,hei#/2,hei#/2);
+       cthick := (1.2+1/4)*stafflinethickness;
+       cxr := w/2-cthick/2;
+       cyr := h-cthick/2;
+       pickup pencircle scaled cthick;
+       draw fullcircle xscaled 2cxr yscaled 2cyr shifted (w/2,0);
+       xpos := cxr/sqrt2;
+       ypos := cyr/sqrt2;
+       draw (-xpos+w/2,-ypos) -- (xpos+w/2,ypos);
+       draw (-xpos+w/2,ypos) -- (xpos+w/2,-ypos);
+
+       charwx := charwd ; 
+       charwy := 0 ;
+
+       z12 = (charwx * hppp , charwy * vppp );
+       labels (12);
+fet_endchar;
+
+
+
+
+%%%%%%%%
+%
+%
+% SOLFA SHAPED NOTES
+%
+%
+
+
+def generic_draw_solfa_note_shape =
+  save a,beta,black,white;
+  path black, white;
+
+  pickup pencircle scaled stafflinethickness;
+  2 beta# = noteheight#;
+  a# = a_b*beta#;
+  wid# := 2a#+stafflinethickness#;
+  hei# := noteheight#+stafflinethickness#;
+  set_char_box(0, wid#,0.5 hei#, 0.5 hei#);
+
+  define_pixels(a,beta);
+
+  black = noteshape xscaled a yscaled beta shifted (a+stafflinethickness/2,0);
+  filldraw black;
+
+  if (solid=false):
+    white = noteishape xscaled (a*ai_a) yscaled (beta*bi_b)
+                       shifted ((dx+1)*(a+stafflinethickness/2),
+                               dy*(beta+stafflinethickness/2));
+    unfill white;
+  fi;
+enddef;  
+
+def draw_solfa_note_shape =
+  save solid; boolean solid;
+  solid=false;
+  generic_draw_solfa_note_shape;
+enddef;
+def draw_solfa_quarter_note_shape =
+  save solid; boolean solid;
+  solid=true;
+  generic_draw_solfa_note_shape;
+enddef;
+
+% do - equilateral triangle: (0,-h/2) -- (w/2,h/2) -- (w,-h/2) -- cycle;
+% stem attachment: -h/2
+
+save triangle; path triangle;
+triangle := (-1,-1) -- (0,1) -- (1,-1) -- cycle;
+
+
+
+
+save solfa_pen_thick;
+solfa_pen_thick# = 2 stafflinethickness#;
+define_pixels (solfa_pen_thick);
+
+def draw_do_head (expr width_factor, dir) =
+       save p ;
+       path p;
+       set_char_box(0, width_factor * noteheight#, 0.5 noteheight#, 0.5 noteheight#);
        
-%      a_b:=1.54;
-%      ai_a:=0;
-%      ai_bi:=1;
-%      b_h:=0.85;
-%      a_w:=1.09;
+       pickup pencircle scaled solfa_pen_thick;
+
+       bot y1 =  -d ;
+       y1 = y2;
+       lft x1 = 0;
+       rt x2 = w;
+       top y3 = h;
+       x3 =.5[x1,x2];
+
+       p := z1 -- z2 -- z3 -- cycle;
+
+       charwx := charwd;
+       charwy := - chardp + 0.5 stafflinethickness#;
+       if dir = -1:
+               charwy := - charwy;
+       fi;
+enddef;
+
+fet_beginchar("Whole dohead", "s0do")
+       draw_do_head (1.8, 1);
+       draw p;
+fet_endchar;
+
+
+fet_beginchar("Half dohead", "d1do")
+       draw_do_head (1.5, -1);
+       draw p;
+fet_endchar;
+
+fet_beginchar("Half dohead", "s1do")
+       draw_do_head (1.5, 1);
+       draw p;
+fet_endchar;
+
+fet_beginchar("Quart dohead", "d2do")
+       draw_do_head (1.55, -1);
+       filldraw p;
+fet_endchar;
+
+
+fet_beginchar("Quart dohead", "s2do")
+       draw_do_head (1.55, 1);
+       filldraw p;
+fet_endchar;
+
+  
+% re - flat top, curved bottom:
+%                (0,h/2) {dir -90} .. (w/2,-h/2) .. {dir 90} (w,h/2) -- cycle;
+% (broader along the base and with more vertical sides for half and
+% whole notes)
+% stem attachment: h/2
+
 
-%      notehead_calc;
+
+def draw_re_head (expr width_factor, dir) =
+       save p ;
+       path p;
+       set_char_box(0, width_factor * noteheight#, 0.5 noteheight#, 0.5 noteheight#);
        
+       pickup pencircle scaled solfa_pen_thick;
+
+       save curve_start;
+       curve_start = 0.7;
+       lft x1 = 0;
+       y1 = y5;
+       x1 = x2;
+       y2 = curve_start [y3,y1];
+       bot y3 = - d;
+       x3 = .5 [x2,x4];
+       rt x4 = w;
+       y4 = y2;
+       top y5 = h;
+       x5 = x4;
+       labels (range 1 thru 5);
+       p := z1 --- z2 .. z3{right} .. z4 --- z5 --- cycle;
+
+       charwx := charwd;
+       charwy := curve_start [-chardp, charht];
+       if dir = -1:
+               charwy := - charwy;
+       fi;
+enddef;
+
+fet_beginchar("Whole rehead", "s0re")
+       draw_re_head (1.8,1);
+       draw p;
+fet_endchar;
+
+
+fet_beginchar("Half up rehead", "u1re")
+       draw_re_head (1.5, 1);
+       draw p;
+fet_endchar;
+
+fet_beginchar("Half down rehead", "d1re")
+       draw_re_head (1.5, -1);
+       draw p;
+fet_endchar;
 
-       head_width# = harmwid;
 
-       define_pixels(head_width);
+fet_beginchar("Quart rehead", "u2re")
+       draw_re_head (1.55, 1);
+       filldraw p;
+fet_endchar;
+
+fet_beginchar("Quart rehead", "d2re")
+       draw_re_head (1.55, -1);
+       filldraw p;
+fet_endchar;
+
+
+
+
+def draw_mi_head (expr width_factor) =
+       save path_out, path_in;
+       path path_out, path_in;
+       set_char_box(0, width_factor * noteheight#, 0.5 noteheight#, 0.5 noteheight#);
        
-%      ht# = noteheight#;
-       head_char_width = 1.54 noteheight;
-       head_char_width# := 1.54 ht#;
-       %schuif_op = head_char_width - head_width; %ugh
-       %schuif_op# := head_char_width# - head_width#;
-%      set_char_box(0, head_char_width#, noteheight#/2, noteheight#/2); 
-       set_char_box(0, head_width#, head_width#/2, head_width#/2);
-%      2 beamheight + holeheight = noteheight;
-       thin = stafflinethickness;
-       thick = 2.2 stafflinethickness;
-%      serif_size = (holeheight - stafflinethickness)/2;
-%      serif_protrude = 1.5 serif_size;
-       penpos1(thick, 45);
-       penpos2(thin, 315);
-       penpos3(thin, 135);
-       penpos4(thick, 45);
-       penpos5(thick, 225);
-       penpos6(thin, 135);
-       penpos7(thin, 315);
-       penpos8(thick, 225);
-
-%      1.5 noteheight = head_width;
-       z1l = (0, 0);
-       z2l = z1l;
-%      z3l = (head_width/2,-head_width/2);
-       z3l = (head_width/2, -noteheight/2);
-       z4l = z3l;
-       z5l = (head_width, 0);
-       z6l = z5l;
-%      z7l = (head_width/2, head_width/2);
-       z7l = (head_width/2, noteheight/2);
-       z8l = z7l;
+       pickup pencircle scaled solfa_pen_thick;
+
+
+       lft x1 = 0;
+       y1 = 0;
+       bot y2 = -d;
+       x2 = .5 [x1, x3];
+       rt x3 = w;
+       x4 = x2;
+       y3 = y1;
+       top y4 = h;
+
+       z6 - z5 = whatever * (z2 - z1);
+       z8 - z7 = whatever * (z2 - z1);
+       z8 - z5 = whatever * (z4 - z1);
+       z6 - z7 = whatever * (z4 - z1);
+
+       z5 = whatever [z1, z4] + (unitvector (z4 - z1) rotated -90 scaled 0.5 solfa_pen_thick);
+       z5 = whatever [z1, z2] + (unitvector (z2 - z1) rotated 90 scaled 0.75 solfa_pen_thick);
+
+       z5 - z1 = -(z7 - z3);
        
-       pickup pencircle; %scaled stemthick;
-       penlabels(1,2,3,4,5,6,7,8);
-       test_grid;
-       fill z1l -- z2r -- z7r -- z7l -- cycle;
-       fill z1l -- z1r -- z4r -- z4l -- cycle;
-       fill z3r -- z3l -- z6l -- z6r -- cycle;
-       fill z5r -- z5l -- z8l -- z8r -- cycle;
+       labels (range 1 thru 8);
+       path_out := z1 -- z2 -- z3 -- z4 -- cycle;
+       path_in := z5 -- z6 -- z7 -- z8 -- cycle;
+%      path_in := z5 -- z1 --cycle;
 enddef;
 
-%save uitsteek;
-% uitsteek = .25;
-harmonic_wid# := interline#;
+fet_beginchar("Whole mihead", "s0mi")
+       draw_mi_head (1.8);
+       filldraw path_out;
+       unfill path_in;
+fet_endchar;
+
+
+fet_beginchar("Half mihead", "s1mi")
+       draw_mi_head (1.6);
+       filldraw path_out;
+       unfill path_in;
+fet_endchar;
+
 
-fet_beginchar("Harmonic notehead","harmonic","harmonicball")
-       draw_harmonic_notehead(harmonic_wid#)
+fet_beginchar("Quart mihead", "s2mi")
+       draw_mi_head (1.65);
+       filldraw path_out;
 fet_endchar;
 
-%fi
+
+
+
+def draw_fa_head (expr width_factor) =
+       set_char_box(0, width_factor * noteheight#, 0.5 noteheight#, 0.5 noteheight#);
+       save p_down, p_up;
+       path p_up, p_down;
+       
+       pickup pencircle scaled solfa_pen_thick;
+
+       lft x1 = 0;
+       top y1 = h;
+
+       rt x2 = w;
+       y2 = y1;
+       bot y3 = -d;
+       x3 = x2;
+
+       y4 = y3;
+       x4 = x1;
+
+       labels(range 1 thru 4);
+
+       p_up := z1 -- z2 -- z3 --cycle;
+       p_down := z1 -- z4 -- z3 --cycle;
+
+       charwy := 0.0;
+       charwx := charwd;
+enddef;
+
+
+fet_beginchar("Whole fa up head", "d0fa")
+       draw_fa_head (1.8);
+       draw p_up;
+fet_endchar;
+
+fet_beginchar("Whole fa down head", "u0fa")
+       draw_fa_head (1.8);
+       draw p_down;
+fet_endchar;
+
+fet_beginchar("half fa up head", "d1fa")
+       draw_fa_head (1.5);
+       draw p_up;
+fet_endchar;
+
+fet_beginchar("Half fa down head", "u1fa")
+       draw_fa_head (1.5);
+       draw p_down;
+fet_endchar;
+
+fet_beginchar("Quarter fa up head", "u2fa")
+       draw_fa_head (1.55);
+       filldraw p_up;
+fet_endchar;
+
+fet_beginchar("Quarter fa down head", "d2fa")
+       draw_fa_head (1.55);
+       filldraw p_down;
+fet_endchar;
+
+
+def draw_la_head (expr width_factor) =
+       set_char_box(0, width_factor * noteheight#, 0.5 noteheight#, 0.5 noteheight#);
+       save p;
+       path p;
+       
+       pickup pencircle scaled solfa_pen_thick;
+
+       lft x1 = 0;
+       top y1 = h;
+
+       rt x2 = w;
+       y2 = y1;
+       bot y3 = -d;
+       x3 = x2;
+
+       y4 = y3;
+       x4 = x1;
+
+       labels(range 1 thru 4);
+
+       p := z1 -- z2 -- z3 -- z4 -- cycle;
+enddef;
+
+fet_beginchar("Whole lahead", "s0la")
+       draw_la_head (1.8);
+       draw p;
+fet_endchar;
+
+
+fet_beginchar("Half lahead", "s1la")
+       draw_la_head (1.5);
+       draw p;
+fet_endchar;
+
+
+fet_beginchar("Quart lahead", "s2la")
+       draw_la_head (1.55);
+       filldraw p;
+fet_endchar;
+
+
+
+def draw_ti_head (expr width_factor, dir) =
+       set_char_box(0, width_factor * noteheight#, 0.5 noteheight#, 0.5 noteheight#);
+       save p;
+       path p;
+       save cone_height;
+       cone_height = 0.64;
+
+       pickup pencircle scaled solfa_pen_thick;
+
+       x1 = .5 [x2, x4];
+       bot y1 = -d;
+       lft x2 = 0;
+       y2 = cone_height [y1,y3];
+       rt x4 = w;
+       y4 = y2;
+       x3 = x1;
+       top y3 = h;
+       
+       labels(range 1 thru 4);
+
+       p := z1 -- z2  .. z3{right} .. z4 -- cycle;
+       charwx := charwd;
+       charwy := cone_height [-chardp, charht];
+       if dir = - 1:
+               charwy := - charwy;
+       fi;
+enddef;
+
+fet_beginchar("Whole up tihead", "s0ti")
+       draw_ti_head (1.8, 1);
+       draw p;
+fet_endchar;
+
+
+fet_beginchar("Half up tihead", "u1ti")
+       draw_ti_head (1.5, 1);
+       draw p;
+fet_endchar;
+
+fet_beginchar("Half down tihead", "d1ti")
+       draw_ti_head (1.5, -1);
+       draw p;
+fet_endchar;
+
+
+
+fet_beginchar("Quart up tihead", "u2ti")
+       draw_ti_head (1.55, 1);
+       filldraw p;
+fet_endchar;
+
+
+fet_beginchar("Quart down tihead", "d2ti")
+       draw_ti_head (1.55, -1);
+       filldraw p;
+fet_endchar;
+
+
 
 fet_endgroup("noteheads");
 
+
+%
+% we derive black_notehead_width# from the quarter head,
+% so we have to define black_notehead_width (pixel qty)  
+% after the black_notehead_width# itself. Let's keep it outside the group as well.
+% 
 define_pixels(black_notehead_width);
+
+
+
+