* mf/feta-bolletjes.mf: make hole in half note little

[lilypond.git] / mf / feta-bolletjes.mf

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index 60c6564867f2572dbdbab37689daa52e5238b347..1d6e27ce44416aa4a7be502de927658e2fde4f59 100644 (file)
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 % & Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % & Juergen Reuter <reuter@ipd.uka.de>
 % 
@@ -65,8 +65,15 @@ else:
                white:=white rotated inner_tilt;
                white:=white shifted (w/2,0);
 fi
+
+       if test = 1:
+               pickup pencircle scaled 1;
+               draw black;
+               draw white;
+       else:
                fill black;
                unfill white;
+       fi      
 
                
        enddef;
@@ -145,9 +152,11 @@ fet_beginchar("Half notehead", "1",
        % superness:=0.66;
        superness:=0.67; % jcn
        % ai_a:=0.863;
-       ai_a:=0.850; % jcn
+       % was 0.85
+       % set to 0.83 to avoid stem entering white part.
+       ai_a:=0.830; 
        % ai_bi:=3.14;
-       ai_bi:=3.30; % jcn
+       ai_bi:=3.25;
        err_y_ai:=0;
        err_x_bi:=-0.12;
        inner_tilt:=tilt;
@@ -158,6 +167,13 @@ fet_beginchar("Half notehead", "1",
        notehead_calc;
        half_notehead_width# := wd#;
        notehead_draw;
+
+       define_pixels (wd);
+       if test = 1:
+               pickup penrazor scaled stemthickness;
+               draw (.5 stemthickness, -2 staff_space) ..
+                   (.5 stemthickness, - wd * (ypart dir (inner_tilt - 10)) /2);
+       fi;
 fet_endchar;
 
 
@@ -274,13 +290,50 @@ fet_beginchar("Quart diamondhead", "2diamond", "diamondhead")
 fet_endchar;
 
 
+save pent;
+pen_thick# = 2stafflinethickness#;
+define_pixels(pen_thick);
+
 
 begingroup;
+
+
+def def_triangle_old =
+        save triangle,kern; path triangle;
+        kern = 1/3(x2-x1);
+        z2 = z1 rotated 120;
+        z3 = z1 rotated 240;
+        z12 = caveness[.5[z1,z2],z3];
+        z23 = z12 rotated 120;
+        z31 = z12 rotated 240;
+        triangle = z1 .. z12 .. z2 ..
+                    z2 .. z23 .. z3 ..
+                    z3 .. z31 .. z1 ..
+                    cycle;
+        triangle := triangle shifted (-x1+pent/2-kern,0) xscaled xs;
+        pickup pencircle scaled pent xscaled xs;
+        hei = max(y1,-y2)+pent/2; 
+        %set_char_box(-kern*xs*fac, ((x3-x1)*fac+pent#)*xs,hei*fac,hei*fac);
+        set_char_box(0, ((x3-x1-kern)*fac+pent#)*xs,hei*fac,hei*fac);
+enddef;
+
+
 def def_triangle =
        save triangle,kern; path triangle;
-       kern = 1/3(x2-x1);
+       save left_point, height, width;
+       pair exact_left_point;
+
+       exact_left_point := llap# * dir (90 + tilt);
+       height# = max (ypart exact_left_point,
+                       -ypart  (exact_left_point rotated 120)) + pen_thick#/2;
+
+       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;
+
        z12 = caveness[.5[z1,z2],z3];
        z23 = z12 rotated 120;
        z31 = z12 rotated 240;
@@ -288,21 +341,20 @@ def def_triangle =
                    z2 .. z23 .. z3 ..
                    z3 .. z31 .. z1 ..
                    cycle;
-       triangle := triangle shifted (-x1+pent/2-kern,0) xscaled xs;
-       pickup pencircle scaled pent xscaled xs;
-       hei = max(y1,-y2)+pent/2; 
-       %set_char_box(-kern*xs*fac, ((x3-x1)*fac+pent#)*xs,hei*fac,hei*fac);
-       set_char_box(0, ((x3-x1-kern)*fac+pent#)*xs,hei*fac,hei*fac);
+       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#);
 enddef;
-save fac,pent;
-fac = noteheight#/noteheight;
-pent# = 2stafflinethickness#;
-define_pixels(pent);
-
 
 fet_beginchar("Whole trianglehead", "0triangle", "wholetrianglehead")
        save hei,xs;
-       z1 = dir(130)*3/4noteheight;
+       save llap;
+       save tilt;
+
+       tilt = 40;
+       llap# = 3/4noteheight#;
+
        xs = 1.5;
        caveness:=0.1;
        def_triangle;
@@ -311,7 +363,11 @@ fet_endchar;
 
 fet_beginchar("Half trianglehead", "1triangle", "halftrianglehead")
        save hei,xs;
-       z1 = dir(130)*2/3noteheight;
+       save llap;
+       save tilt;
+
+       tilt = 40;
+       llap# = 2/3noteheight#;
        xs = 1.2;
        caveness:=0.1;
        def_triangle;
@@ -320,7 +376,10 @@ fet_endchar;
 
 fet_beginchar("Quart trianglehead", "2triangle", "trianglehead")
        save hei,xs;
-       z1 = dir(130)*2/3noteheight;
+       save llap;
+       save tilt;
+       tilt = 40;
+       llap# = 2/3noteheight#;
        xs = 1.0;
        caveness:=0.1;
        def_triangle;
@@ -435,19 +494,6 @@ fet_beginchar("X-Circled notehead", "2xcircle", "xcircledhead")
 fet_endchar;
 
 
-%%%%%%%%%%%%
-%
-%
-% ledger (leger) lines
-%
-fet_beginchar("Ledger ending", "ledgerending", "ledgerending")
-set_char_box (5/2 ledgerlinethickness#, 5/2 ledgerlinethickness#,
-               ledgerlinethickness#/2,ledgerlinethickness#/2);
-
-
-       draw_rounded_block((-b,-d),(w,h), 0.8 ledgerlinethickness);
-fet_endchar;
-
 
 fet_endgroup("noteheads");
 define_pixels(black_notehead_width);