]> git.donarmstrong.com Git - lilypond.git/blobdiff - mf/feta-bolletjes.mf
projects / lilypond.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2003 -> 2004
[lilypond.git] / mf / feta-bolletjes.mf
diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index 3f2b7db128825bde971a54aaaabc4da6f73bfc8e..9cef0532676e40fb5758a282e6b02ac2958e0730 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--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>
 % 
@@ -179,10 +179,100 @@ fet_beginchar("Half notehead", "1", "halfhead")
 fet_endchar;
        
 fet_beginchar("Quart notehead", "2", "quarthead")
-       draw_outside_ellipse (1.54 - puff_up_factor / 2.0, 32, 0.707, 0);
+
+       % used to have 32. With 30, they are slightly bolder.
+       draw_outside_ellipse (1.42 - puff_up_factor / 3.0, 30, 0.707, 0);
        black_notehead_width# := charwd;
 fet_endchar;
 
+%%%%%%%%%%%%%%%%
+
+%% testing shapes.
+
+if 0 = 1 : 
+
+
+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 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);
+fet_endchar;
+
+fi
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
@@ -203,7 +293,7 @@ fet_beginchar("Half diamondhead", "1diamond",
 
 fet_endchar;
 
-fet_beginchar("Quart diamondheadh", "2diamondh", "diamondheadh")
+fet_beginchar("Quart diamondhead", "2diamond", "diamondhead")
        draw_outside_ellipse (1.80, 35, 0.495, -0.25);
 fet_endchar;
 
@@ -285,13 +375,18 @@ fet_beginchar("Quart trianglehead", "2triangle", "trianglehead")
 fet_endchar;
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%
+% slash heads are for indicating improvisation. They are  
+% twice as high as normal heads.
+%
 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, staff_space# / slash_slope + hwid_hash,
-                       staff_space#/2 + stafflinethickness#/2,
-                       staff_space#/2 + stafflinethickness#/2);
+       set_char_box (0, 2 exact_height / slash_slope + hwid_hash,
+                       exact_height, exact_height);
 
        charwx := charwd;
        charwy := charht;
@@ -302,13 +397,14 @@ def draw_slash(expr hwid_hash) =
        bot y1 = - d;
        top y2 = h;
        lft x1 = 0;
-       lft x2 = staff_space / slash_slope;
+       lft x2 = 2 h / slash_slope;
        
        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#:
@@ -319,11 +415,11 @@ def draw_slash(expr hwid_hash) =
                y5 = y8;
                y3 - y7 = th;
                y5 - y1 = th;
-               z6 - z5 = whatever * (1,  slash_slope);
-               z8 - z7 = whatever * (1,  slash_slope);
+               z6 - z5 = whatever * ne_dir;
+               z8 - z7 = whatever * ne_dir;
 
-               z5  = z1 + whatever * (1,  slash_slope) + (th, 0);
-               z8  = z4 + whatever * (1,  slash_slope) + (-th, 0);
+               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;
@@ -332,19 +428,18 @@ def draw_slash(expr hwid_hash) =
 enddef;
 
 fet_beginchar("Whole slashhead","0slash","wholeslashhead")
-       draw_slash(2 slash_thick# + 0.5 staff_space#);
+       draw_slash(4 slash_thick# + 0.5 staff_space#);
 fet_endchar;
 
 fet_beginchar("Half slashhead","1slash","halfslashhead")
-       draw_slash(2 slash_thick# + 0.15 staff_space#);
+       draw_slash(3.0 slash_thick# + 0.15 staff_space#);
 fet_endchar;
 
 fet_beginchar("Quart slashhead","2slash","quartslashhead")
-       draw_slash(slash_thick#);
+       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
@@ -354,12 +449,12 @@ def draw_cross(expr thick) =
        pair ne_dir;
        save crz; path crz;
 
-       pent# := 1.2stafflinethickness#;
-       define_pixels (pent);
-       pickup pencircle scaled pent;
+       pen_thick# := 1.2stafflinethickness#;
+       define_pixels (pen_thick);
+       pickup pencircle scaled pen_thick;
 
        top y3 = h;
-       ne_dir := unitvector ((1, (2 h -pent)/(w - pent)));
+       ne_dir := unitvector ((1, (2 h -pen_thick)/(w - pen_thick)));
        rt x4 = w/2;
        y5 = 0;
        z4 - z5 = whatever * ne_dir;
@@ -369,8 +464,8 @@ def draw_cross(expr thick) =
 
        z4 - z3 = whatever * (ne_dir) + (ne_dir rotated -90) * thick * stafflinethickness;
 
-       x1 = charwd/2 - .5 pent#;
-       z1 = whatever * ne_dir + thick * stafflinethickness * (ne_dir rotated -90);
+       x1 = charwd/2 - .5 pen_thick#;
+       z1 = whatever * ne_dir + thick/2 * stafflinethickness# * (ne_dir rotated -90);
 
        
        labels (1,2,3,4,5,6);
@@ -384,6 +479,10 @@ 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")
@@ -422,8 +521,11 @@ fet_beginchar("X-Circled notehead", "2xcircle", "xcircledhead")
        draw (-xpos+w/2,-ypos) -- (xpos+w/2,ypos);
        draw (-xpos+w/2,ypos) -- (xpos+w/2,-ypos);
 
-       charwx := 3/4 charwd ; 
-       charwy := 1/4 charwd ; 
+       charwx := charwd ; 
+       charwy := 0 ;
+
+       z12 = (charwx * hppp , charwy * vppp );
+       labels (12);
 fet_endchar;
 
 
Debian packaging of lilypond