]> git.donarmstrong.com Git - lilypond.git/blobdiff - mf/feta-bolletjes.mf
* mf/feta-params.mf (stafflines): fix stafflinethickness at 0.5 pt
[lilypond.git] / mf / feta-bolletjes.mf
index 3aac7752a9f2e12a563bb7de9a445f557c02b4f3..b895f96e4496cd2d5a6541a88d1dbbec1a3fe2f0 100644 (file)
@@ -3,8 +3,9 @@
 % 
 % 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--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% & Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 
@@ -18,93 +19,13 @@ numeric black_notehead_width;
 
 fet_begingroup("noteheads");
 
-noteheight#:=interline#+ (1 + overdone_heads) *stafflinethickness#;
+noteheight#:=staff_space#+ (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;
-
-
-       define_pixels(head_width);
-       set_char_box(0, head_width#, noteheight#/2, noteheight#/2);
-       
-       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);
-
-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;
-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_endchar;
-
-fet_beginchar("Brevis notehead", "-1", "brevisball")
-       draw_brevis(brevis_wid#);
-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
-%
-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);
-       
-       fill z7r .. z6r{z6-z7} .. {z7-z6} z6l -- z7l -- cycle;
-       penlabels(6,7);
-fet_endchar;
 
+%%% TODO: Document these!
+%
 
 % setup user vars
 def setup_notehead_vars =
@@ -128,12 +49,22 @@ def notehead_calc =
        enddef;
 
 
+% a: x diameter
+% b: y diameter
+% err_x: drift of y axis at top
+% err_y: drift of x axis at right
+def distorted_ellipse(expr a,b,err_y,err_x,super) =
+       superellipse((a,err_x),(-err_y,b),(-a,-err_x),(err_y,-b),super);
+       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
+if test > 1: %fixme
                save x;
                x1=-x3=a; x2=x4=0; y1=y3=0; y2=-y4=b;
                penlabels(1,2,3,4);
@@ -144,15 +75,20 @@ 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;
 
-% whole note
-% Wanske, p.38
-fet_beginchar("Whole notehead", "0", "wholeball")
+def draw_whole_head =
        setup_notehead_vars;
        
        a_b:=1.80;
@@ -176,6 +112,40 @@ fet_beginchar("Whole notehead", "0", "wholeball")
        notehead_calc;
        whole_notehead_width# := wd#;
        notehead_draw;
+enddef;
+
+
+%
+% dimensions aren't entirely right.
+%
+fet_beginchar ("Brevis notehead", "-1", "brevishead");
+       save stemthick, fudge;
+       define_pixels (stemthick);
+       fudge = blot_diameter /2;
+       stemthick# = 2 stafflinethickness#;
+
+       draw_whole_head;
+
+       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;
+
+% whole note
+% Wanske, p.38
+fet_beginchar("Whole notehead", "0", "wholehead")
+       draw_whole_head;
 fet_endchar;
 
 
@@ -183,18 +153,22 @@ fet_endchar;
 % half note
 % Wanske, p.39
 fet_beginchar("Half notehead", "1", 
-       "halfball")
+       "halfhead")
        setup_notehead_vars;
-               % a_b:=1.49; % after text
+       % 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
+       % 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;
@@ -205,13 +179,20 @@ 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;
 
 
 
 % quarter note
 % Wanske p.38
-fet_beginchar("Quart notehead", "2", "quartball")
+fet_beginchar("Quart notehead", "2", "quarthead")
        setup_notehead_vars;
        % a_b:=1.57; % after text
        a_b:=1.54; % after drawing
@@ -233,86 +214,318 @@ fet_beginchar("Quart notehead", "2", "quartball")
 fet_endchar;
 
 
+% whole note
+% Wanske, p.38
+fet_beginchar("Whole diamondhead", "0diamond", "wholediamondhead")
+       setup_notehead_vars;
+       
+       a_b:=1.80;
+       err_y_a:=0; % no slant
+       tilt:=0;
+       superness:=0.495;
+       ai_a:=0.350;
+       % 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.6; % 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;
 
 
-%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;
-       
-%      setup_notehead_vars;
-       
-%      a_b:=1.54;
-%      ai_a:=0;
-%      ai_bi:=1;
-%      b_h:=0.85;
-%      a_w:=1.09;
+% half note
+% Wanske, p.39
+fet_beginchar("Half diamondhead", "1diamond", 
+       "halfdiamondhead")
+       setup_notehead_vars;
 
-%      notehead_calc;
-       
+       a_b := 1.50; % after drawing
+       err_y_a:=0.157;
 
-       head_width# = harmwid;
+       tilt:=34;
+       superness:=0.49; % jcn
+       ai_a:=0.550; % jcn
+       ai_bi:=3.30; % jcn
 
-       define_pixels(head_width);
-       
-%      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;
+       err_y_ai:=0;
+       err_x_bi:=-0.12;
+       inner_tilt:=tilt;
+       inner_superness:=0.80;
+
+       b_h:= 1.03;
+       a_w:= 1.2;
+
+       notehead_calc;
+       half_notehead_width# := wd#;
+       notehead_draw;
+fet_endchar;
+
+
+% quarter note
+% Wanske p.38
+fet_beginchar("Quart diamondhead", "2diamond", "diamondhead")
+       set_char_box(0, black_notehead_width#, noteheight#/2, noteheight#/2);
+       save a_b,err_y_a,tilt,superness;
+       save b_h,a_w;
+       save a,beta,ai,bi, ht, wd;
+
+       a_b:= 1.8;
+       err_y_a:=-0.044;
+       b_h:=0.90;
+       a_w:=1.1;
+       tilt:=35;
+       superness:=0.495;
+
+       ht# =noteheight#;
+       2beta#=ht#*b_h;
+       a# = beta#*a_b;
+
+       define_pixels(a,beta);
+
+       black := distorted_ellipse(.72 noteheight, .45 noteheight, -.2 noteheight ,   0, superness)
+                               
+%                      beta,a*err_y_a,0,superness);
+
+       black:=black rotated tilt;
+       black:=black shifted (w/2,0);
+       fill black;
+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;
+       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;
+       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#);
+enddef;
+
+fet_beginchar("Whole trianglehead", "0triangle", "wholetrianglehead")
+       save hei,xs;
+       save llap;
+       save tilt;
+
+       tilt = 40;
+       llap# = 3/4noteheight#;
+
+       xs = 1.5;
+       caveness:=0.1;
+       def_triangle;
+       draw triangle;
+fet_endchar;
+
+fet_beginchar("Half trianglehead", "1triangle", "halftrianglehead")
+       save hei,xs;
+       save llap;
+       save tilt;
+
+       tilt = 40;
+       llap# = 2/3noteheight#;
+       xs = 1.2;
+       caveness:=0.1;
+       def_triangle;
+       draw triangle;
+fet_endchar;
+
+fet_beginchar("Quart trianglehead", "2triangle", "trianglehead")
+       save hei,xs;
+       save llap;
+       save tilt;
+       tilt = 40;
+       llap# = 2/3noteheight#;
+       xs = 1.0;
+       caveness:=0.1;
+       def_triangle;
+       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#;
+
+define_pixels(slash_thick);
+
+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);
+
+       clearxy;
+       pickup pencircle scaled blot_diameter;
+
+       bot y1 = - d;
+       top y2 = h;
+       lft x1 = 0;
+       lft x2 = staff_space / slash_slope;
        
-       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;
+       rt x3 = w;
+       y3 = y2;
+       y4 = y1;
+       x3- x2 = x4 - x1;
+
+       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 * (1,  slash_slope);
+               z8 - z7 = whatever * (1,  slash_slope);
+
+               z5  = z1 + whatever * (1,  slash_slope) + (th, 0);
+               z8  = z4 + whatever * (1,  slash_slope) + (-th, 0);
+
+               unfill
+                       z5 -- z6 -- z7 -- z8 -- cycle;
+       fi
+       labels (range 1 thru 10);
+
+
 enddef;
 
-%save uitsteek;
-% uitsteek = .25;
-harmonic_wid# := interline#;
 
-fet_beginchar("Harmonic notehead","harmonic","harmonicball")
-       draw_harmonic_notehead(harmonic_wid#)
+
+
+fet_beginchar("Whole slashhead","0slash","wholeslashhead")
+       draw_slash(2 slash_thick# + 0.5 staff_space#);
 fet_endchar;
 
-%fi
+fet_beginchar("Half slashhead","1slash","halfslashhead")
+       draw_slash(2 slash_thick# + 0.15 staff_space#);
+fet_endchar;
 
-fet_endgroup("noteheads");
+fet_beginchar("Quart slashhead","2slash","quartslashhead")
+       draw_slash(slash_thick#);
+fet_endchar;
+
+% thick is the distance between the two parallel lines in the cross (distance between centres of lines)
+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 crz; path crz;
+       crz = (xa,0) -- (xa+xl,yl) -- (xl,yl+ya) -- (0,ya);
+       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);
+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);
+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);
+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);
+fet_endchar;
+
+fet_beginchar("X-Circled notehead", "2xcircle", "xcircledhead")
+       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);
+fet_endchar;
+
+
+
+fet_endgroup("noteheads");
 define_pixels(black_notehead_width);