]> git.donarmstrong.com Git - lilypond.git/blobdiff - mf/feta-bolletjes.mf
2003 -> 2004
[lilypond.git] / mf / feta-bolletjes.mf
index 0a9dc06aa0039377471f39e86e102d088b4ba544..9cef0532676e40fb5758a282e6b02ac2958e0730 100644 (file)
@@ -3,27 +3,50 @@
 % 
 % 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>
 % 
 
+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");
 
-test_outlines := 0;
 
+
+% 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 * ELLIPSIDITY,
 % so SLANT = -1, puts the extreme on the long axis next to the short axis one.)
@@ -31,6 +54,7 @@ noteheight#:=staff_space#+ (1 + overdone_heads) *stafflinethickness#;
 
 def draw_outside_ellipse (expr ellipsidity, tilt, superness,
                        slant) =
+       save attachment_y;
        save p;
        path p;
 
@@ -54,6 +78,10 @@ def draw_outside_ellipse (expr ellipsidity, tilt, superness,
        
        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;
@@ -132,8 +160,6 @@ fet_endchar;
 
 
 
-% whole note
-% Wanske, p.38
 fet_beginchar("Whole notehead", "0", "wholehead")
        draw_outside_ellipse (1.80 - puff_up_factor / 3.0, 0, 0.707, 0);
        undraw_inside_ellipse (1.30, 125 - puff_up_factor *10,
@@ -145,8 +171,6 @@ fet_beginchar("Whole notehead", "0", "wholehead")
 fet_endchar;
 
 
-% half note
-% Wanske, p.39
 fet_beginchar("Half notehead", "1", "halfhead")
        draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, 0.66, 0.17);
        undraw_inside_ellipse (3.25, 33, 0.81,
@@ -154,14 +178,102 @@ fet_beginchar("Half notehead", "1", "halfhead")
 
 fet_endchar;
        
-% quarter note
-% Wanske p.38
 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
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 fet_beginchar("Whole diamondhead", "0diamond", "wholediamondhead")
@@ -172,8 +284,6 @@ fet_beginchar("Whole diamondhead", "0diamond", "wholediamondhead")
 
 fet_endchar;
 
-% half note
-% Wanske, p.39
 fet_beginchar("Half diamondhead", "1diamond", 
        "halfdiamondhead")
 
@@ -183,45 +293,23 @@ fet_beginchar("Half diamondhead", "1diamond",
 
 fet_endchar;
 
-% quarter note
-% Wanske p.38
-fet_beginchar("Quart diamondheadh", "2diamondh", "diamondheadh")
+fet_beginchar("Quart diamondhead", "2diamond", "diamondhead")
        draw_outside_ellipse (1.80, 35, 0.495, -0.25);
 fet_endchar;
 
-
-save pen_thick;
-pen_thick# = stafflinethickness#  + .1 staff_space#;
-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;
        save left_point, height, width;
        pair exact_left_point;
+       save pen_thick;
+       pen_thick# = stafflinethickness#  + .1 staff_space#;
+       define_pixels(pen_thick);
 
        exact_left_point := llap# * dir (90 + tilt);
        height# = max (ypart exact_left_point,
@@ -286,23 +374,22 @@ fet_beginchar("Quart trianglehead", "2triangle", "trianglehead")
        filldraw triangle;
 fet_endchar;
 
-endgroup;
-
-%%% Editable values:
-
-
-% slope of slash. From scm/grob-description.scm. How to auto-copy?
-slash_slope := 1.7; 
-
-% thickness of lines. quarter notes get 1.5slt width.
-slash_thick# := 2/3*0.48staff_space#;
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% 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;
 
-define_pixels(slash_thick);
+       set_char_box (0, 2 exact_height / slash_slope + hwid_hash,
+                       exact_height, exact_height);
 
-def draw_slash(expr hwid_hash) =
-       set_char_box (0, staff_space# / slash_slope + hwid_hash,
-                       staff_space#/2 + stafflinethickness#/2,
-                       staff_space#/2 + stafflinethickness#/2);
+       charwx := charwd;
+       charwy := charht;
 
        clearxy;
        pickup pencircle scaled blot_diameter;
@@ -310,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#:
@@ -327,75 +415,96 @@ 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;
        fi
        labels (range 1 thru 10);
-
-
 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 two parallel lines in the cross (distance between centres of lines)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% 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) =
-       pent := 1.2stafflinethickness;
-       pickup pencircle scaled pent;
-       % alfa is the slant of the lines (i.e. 1 means 45 degrees)
-       alfa := (2h-pent)/(w-pent);
-       % llen is the length of the little outer lines
-       % llen = thick / sin(2atan(alfa))
-       llen := thick/(ypart(dir(2angle(1,alfa))));
-       xa := llen/sqrt(1+alfa**2);
-       ya := xa*alfa;
-       xl := w/2-xa-pent/2;
-       yl := h-ya-pent/2;
+       save pent, slant, ne_dir;
+       pair ne_dir;
        save crz; path crz;
-       crz = (xa,0) -- (xa+xl,yl) -- (xl,yl+ya) -- (0,ya);
+
+       pen_thick# := 1.2stafflinethickness#;
+       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);
+
+       
+       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;
+               message (decimal charwx);
+               message (decimal charwy);
+       z12 = (charwx * hppp, y1 * vppp);
+       labels (12);
 enddef;
 
 fet_beginchar("Whole Crossed notehead", "0cross", "wholecrossedhead")
        wid# := black_notehead_width#+4stafflinethickness#;
        hei# := noteheight#+stafflinethickness#;
        set_char_box(0, wid#,hei#/2,hei#/2);
-       draw_cross(3.75stafflinethickness);
+       
+       draw_cross (3.75);
 fet_endchar;
 
 fet_beginchar("Half Crossed notehead", "1cross", "halfcrossedhead")
        wid# := black_notehead_width#+2stafflinethickness#;
        hei# := noteheight#+stafflinethickness#/2;
        set_char_box(0, wid#,hei#/2,hei#/2);
-       draw_cross(3stafflinethickness);
+       draw_cross(3.0);
 fet_endchar;
 
 fet_beginchar("Crossed notehead", "2cross", "crossedhead")
        wid# := black_notehead_width#;
        hei# := noteheight#;
        set_char_box(0, wid#,hei#/2,hei#/2);
-       draw_cross(stafflinethickness/4);
+       draw_cross(1.0);
 fet_endchar;
 
 fet_beginchar("X-Circled notehead", "2xcircle", "xcircledhead")
@@ -411,9 +520,16 @@ fet_beginchar("X-Circled notehead", "2xcircle", "xcircledhead")
        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;
 
 
 
 fet_endgroup("noteheads");
+
 define_pixels(black_notehead_width);