]> git.donarmstrong.com Git - lilypond.git/blobdiff - mf/feta-bolletjes.mf
(triangle): add s to 0triangle.
[lilypond.git] / mf / feta-bolletjes.mf
index 6cdf6b929068165d56cd7f34f3b1b96a4daff951..c429ea861ca4abf8591eb54e5b8adf55a6c260c5 100644 (file)
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 % & Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % & Juergen Reuter <reuter@ipd.uka.de>
 % 
@@ -24,6 +24,7 @@ save black_notehead_width, noteheight,
        slash_thick, slash_slope, overdone_heads;
 numeric black_notehead_width, noteheight, slash_thick;
 
+
 fet_begingroup("noteheads");
 
 
@@ -48,18 +49,18 @@ define_pixels(slash_thick, noteheight);
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% SLANT moves both extremes on the long axis (by SLANT * ELLIPSIDITY,
+% 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 ellipsidity, tilt, superness,
-                       slant) =
+def draw_outside_ellipse (expr ellipticity, tilt, superness,
+                         slant) =
        save attachment_y;
        save p;
        path p;
 
-       p := superellipse ((ellipsidity, 0), (-slant * ellipsidity, 1.0),
-                       (- ellipsidity, 0), (slant * ellipsidity, -1.0), superness);
+       p := superellipse ((ellipticity, 0), (-slant * ellipticity, 1.0),
+                       (- ellipticity, 0), (slant * ellipticity, -1.0), superness);
 
        p := p rotated tilt;
 
@@ -91,14 +92,14 @@ def draw_outside_ellipse (expr ellipsidity, tilt, superness,
 enddef;
 
 
-def undraw_inside_ellipse (expr ellipsidity, tilt, superness, clearance,
+def undraw_inside_ellipse (expr ellipticity, tilt, superness, clearance,
                        center) =
 begingroup
        save p;
        path p;
 
-       p := superellipse ((ellipsidity, 0), (0, 1.0),
-                       (- ellipsidity, 0), (0, -1.0), superness);
+       p := superellipse ((ellipticity, 0), (0, 1.0),
+                       (- ellipticity, 0), (0, -1.0), superness);
 
        p := p rotated tilt;
 
@@ -131,10 +132,10 @@ enddef;
 %
 % dimensions aren't entirely right.
 %
-fet_beginchar ("Brevis notehead", "-1", "brevishead");
+fet_beginchar ("Brevis notehead", "s-1");
        save stemthick, fudge;
        define_pixels (stemthick);
-       fudge = blot_diameter /2;
+       fudge = blot_diameter / 2;
        stemthick# = 2 stafflinethickness#;
 
        draw_outside_ellipse (1.80, 0, 0.707, 0);
@@ -160,7 +161,7 @@ fet_endchar;
 
 
 
-fet_beginchar("Whole notehead", "0", "wholehead")
+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#,
@@ -171,103 +172,24 @@ fet_beginchar("Whole notehead", "0", "wholehead")
 fet_endchar;
 
 
-fet_beginchar("Half notehead", "1", "halfhead")
+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", "2", "quarthead")
-       draw_outside_ellipse (1.54 - puff_up_factor / 2.0, 32, 0.707, 0);
-       black_notehead_width# := charwd;
-fet_endchar;
-
-%%%%%%%%%%%%%%%%
-
-fet_beginchar("Quart noteheadPQ", "2PQ", "quartheadPQ")
-       draw_outside_ellipse (1.0 - puff_up_factor / 2.0, 32, 0.707, 0);
-fet_endchar;
-
-fet_beginchar("Quart noteheadAA", "2AA", "quartheadAA")
-       draw_outside_ellipse (1.35 - puff_up_factor / 2.0, 32, 0.707, 0);
-fet_endchar;
-
-fet_beginchar("Quart noteheadAB", "2AB", "quartheadAB")
-       draw_outside_ellipse (1.4 - puff_up_factor / 2.0, 32, 0.707, 0);
-       
-fet_endchar;
-fet_beginchar("Quart noteheadAC", "2AC", "quartheadAC")
-       draw_outside_ellipse (1.45 - puff_up_factor / 2.0, 32, 0.707, 0);
-fet_endchar;
-
-fet_beginchar("Quart noteheadAD", "2AD", "quartheadAD")
-       draw_outside_ellipse (1.5 - puff_up_factor / 2.0, 32, 0.707, 0);
-fet_endchar;
-
-fet_beginchar("Quart noteheadAD", "2AE", "quartheadAD")
-       draw_outside_ellipse (1.55 - puff_up_factor / 2.0, 32, 0.707, 0);
-fet_endchar;
-
-fet_beginchar("Quart noteheadAD", "2AF", "quartheadAD")
-       draw_outside_ellipse (1.6 - puff_up_factor / 2.0, 32, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadAD", "2AG", "quartheadAD")
-       draw_outside_ellipse (1.65 - puff_up_factor / 2.0, 32, 0.707, 0);
-fet_endchar;
-
-
-fet_beginchar("Quart noteheadBA", "2BA", "quartheadBA")
-       draw_outside_ellipse (1.35 - puff_up_factor / 2.0, 35, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadBB", "2BB", "quartheadBB")
-       draw_outside_ellipse (1.4 - puff_up_factor / 2.0, 35, 0.707, 0);
-       
-fet_endchar;
-fet_beginchar("Quart noteheadBC", "2BC", "quartheadBC")
-       draw_outside_ellipse (1.45 - puff_up_factor / 2.0, 35, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadBD", "2BD", "quartheadBD")
-       draw_outside_ellipse (1.5 - puff_up_factor / 2.0, 35, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadBD", "2BE", "quartheadBD")
-       draw_outside_ellipse (1.55 - puff_up_factor / 2.0, 35, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadBD", "2BF", "quartheadBD")
-       draw_outside_ellipse (1.6 - puff_up_factor / 2.0, 35, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadBD", "2BG", "quartheadBD")
-       draw_outside_ellipse (1.65 - puff_up_factor / 2.0, 35, 0.707, 0);
-fet_endchar;
-
+fet_beginchar("Quart notehead", "s2")
 
-
-fet_beginchar("Quart noteheadCA", "2CA", "quartheadCA")
-       draw_outside_ellipse (1.35 - puff_up_factor / 2.0, 40, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadCB", "2CB", "quartheadCB")
-       draw_outside_ellipse (1.4 - puff_up_factor / 2.0, 40, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadCC", "2CC", "quartheadCC")
-       draw_outside_ellipse (1.45 - puff_up_factor / 2.0, 40, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadCD", "2CD", "quartheadCD")
-       draw_outside_ellipse (1.5 - puff_up_factor / 2.0, 40, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadCD", "2CE", "quartheadCD")
-       draw_outside_ellipse (1.55 - puff_up_factor / 2.0, 40, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadCD", "2CF", "quartheadCD")
-       draw_outside_ellipse (1.6 - puff_up_factor / 2.0, 40, 0.707, 0);
-fet_endchar;
-fet_beginchar("Quart noteheadCD", "2CG", "quartheadCD")
-       draw_outside_ellipse (1.65 - puff_up_factor / 2.0, 40, 0.707, 0);
+       % 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", "0diamond", "wholediamondhead")
+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#,
@@ -275,8 +197,7 @@ fet_beginchar("Whole diamondhead", "0diamond", "wholediamondhead")
 
 fet_endchar;
 
-fet_beginchar("Half diamondhead", "1diamond", 
-       "halfdiamondhead")
+fet_beginchar("Half diamondhead", "s1diamond")
 
        draw_outside_ellipse (1.50, 34, 0.49, 0.17);
        undraw_inside_ellipse (3.5, 33, 0.80,
@@ -284,7 +205,7 @@ fet_beginchar("Half diamondhead", "1diamond",
 
 fet_endchar;
 
-fet_beginchar("Quart diamondheadh", "2diamondh", "diamondheadh")
+fet_beginchar("Quart diamondhead", "s2diamond")
        draw_outside_ellipse (1.80, 35, 0.495, -0.25);
 fet_endchar;
 
@@ -294,39 +215,60 @@ fet_endchar;
 
 
 
-def def_triangle =
+def define_triangle_shape(expr stemdir) =
        save triangle,kern; path triangle;
-       save left_point, height, width;
-       pair exact_left_point;
+       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);
+       define_pixels(pen_thick, llap);
+
+       left_up_dir = llap# * dir (90 + tilt);
 
-       exact_left_point := llap# * dir (90 + tilt);
-       height# = max (ypart exact_left_point,
-                       -ypart  (exact_left_point rotated 120)) + pen_thick#/2;
+       xpart (left_up_dir) * xs - (pen_thick# * xs)/2 + xpart origin = 0;
+       ypart origin = 0;
 
-       kern# = 1/3 xpart (exact_left_point - (exact_left_point rotated 120));
-       width# = xpart (-exact_left_point + (exact_left_point rotated 240));
-       define_pixels (kern);   
-       z1 = (hround_pixels (xpart exact_left_point), vround_pixels  (ypart exact_left_point));
-       z2 = z1 rotated 120;
-       z3 = z1 rotated 240;
+       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 = z12 rotated 120;
-       z31 = z12 rotated 240;
+       z23 = caveness[.5[z2,z3],z1];
+       z31 = caveness[.5[z3,z1],z2];
+
        triangle = z1 .. z12 .. z2 ..
                    z2 .. z23 .. z3 ..
                    z3 .. z31 .. z1 ..
                    cycle;
-       triangle := triangle shifted (-x1+pen_thick/2-kern,0) xscaled xs;
        pickup pencircle scaled pen_thick xscaled xs;
-%      labels(1,2,12,23,31,3);
-       set_char_box(0, width# - kern#+ pen_thick#, height#, height#);
+       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("Whole trianglehead", "0triangle", "wholetrianglehead")
+fet_beginchar("Whole trianglehead", "s0triangle")
        save hei,xs;
        save llap;
        save tilt;
@@ -336,11 +278,12 @@ fet_beginchar("Whole trianglehead", "0triangle", "wholetrianglehead")
 
        xs = 1.5;
        caveness:=0.1;
-       def_triangle;
+       define_triangle_shape(1);
        draw triangle;
 fet_endchar;
 
-fet_beginchar("Half trianglehead", "1triangle", "halftrianglehead")
+
+def draw_closed_triangle_head(expr dir) =
        save hei,xs;
        save llap;
        save tilt;
@@ -349,11 +292,19 @@ fet_beginchar("Half trianglehead", "1triangle", "halftrianglehead")
        llap# = 2/3noteheight#;
        xs = 1.2;
        caveness:=0.1;
-       def_triangle;
+       define_triangle_shape(dir);
        draw triangle;
+enddef;
+
+fet_beginchar("Half trianglehead", "d1triangle")
+       draw_closed_triangle_head(-1);
 fet_endchar;
 
-fet_beginchar("Quart trianglehead", "2triangle", "trianglehead")
+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;
@@ -361,8 +312,16 @@ fet_beginchar("Quart trianglehead", "2triangle", "trianglehead")
        llap# = 2/3noteheight#;
        xs = 1.0;
        caveness:=0.1;
-       def_triangle;
+       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;
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -418,15 +377,15 @@ def draw_slash(expr hwid_hash) =
        labels (range 1 thru 10);
 enddef;
 
-fet_beginchar("Whole slashhead","0slash","wholeslashhead")
+fet_beginchar("Whole slashhead","s0slash")
        draw_slash(4 slash_thick# + 0.5 staff_space#);
 fet_endchar;
 
-fet_beginchar("Half slashhead","1slash","halfslashhead")
+fet_beginchar("Half slashhead","s1slash")
        draw_slash(3.0 slash_thick# + 0.15 staff_space#);
 fet_endchar;
 
-fet_beginchar("Quart slashhead","2slash","quartslashhead")
+fet_beginchar("Quart slashhead","s2slash")
        draw_slash(1.5 slash_thick#);
 fet_endchar;
 
@@ -440,7 +399,7 @@ def draw_cross(expr thick) =
        pair ne_dir;
        save crz; path crz;
 
-       pen_thick# := 1.2stafflinethickness#;
+       pen_thick# := 1.2 stafflinethickness#;
        define_pixels (pen_thick);
        pickup pencircle scaled pen_thick;
 
@@ -470,13 +429,11 @@ def draw_cross(expr thick) =
 
        charwx := charwd;
        charwy := y1;
-               message (decimal charwx);
-               message (decimal charwy);
        z12 = (charwx * hppp, y1 * vppp);
        labels (12);
 enddef;
 
-fet_beginchar("Whole Crossed notehead", "0cross", "wholecrossedhead")
+fet_beginchar("Whole Crossed notehead", "s0cross")
        wid# := black_notehead_width#+4stafflinethickness#;
        hei# := noteheight#+stafflinethickness#;
        set_char_box(0, wid#,hei#/2,hei#/2);
@@ -484,21 +441,21 @@ fet_beginchar("Whole Crossed notehead", "0cross", "wholecrossedhead")
        draw_cross (3.75);
 fet_endchar;
 
-fet_beginchar("Half Crossed notehead", "1cross", "halfcrossedhead")
-       wid# := black_notehead_width#+2stafflinethickness#;
+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", "2cross", "crossedhead")
+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", "2xcircle", "xcircledhead")
+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);
@@ -521,6 +478,406 @@ 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#);
+       
+       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
+
+
+
+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;
+
+
+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#);
+       
+       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);
+       
+       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;
+
+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("Quart mihead", "s2mi")
+       draw_mi_head (1.65);
+       filldraw path_out;
+fet_endchar;
+
+
+
+
+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);
+
+
+
+