]> git.donarmstrong.com Git - lilypond.git/blobdiff - mf/feta-bolletjes.mf
release: 1.3.131
[lilypond.git] / mf / feta-bolletjes.mf
index 5ef657ad805962b677dabc5810bbefcc983b144e..eccb52238c09bbde63f699070a419b4f8136ff50 100644 (file)
@@ -1,10 +1,10 @@
-% 
+%  -*-Fundamental-*-
 % feta-bolletjes.mf --  implement noteheads
 % 
 % 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--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 
 save black_notehead_width;
 numeric black_notehead_width;
 
-fet_begingroup("balls");
+fet_begingroup("noteheads");
 
-noteheight#:=interline#+ (1 + overdone_heads) *stafflinethickness#;
+noteheight#:=staff_space#+ (1 + overdone_heads) *stafflinethickness#;
 define_pixels(noteheight);
-brevis_wid# := 2 interline#;
+
+
+%%%%%%%%
+%
+%
+%
+% MENSURAL NOTATION
+%
+%
+%
+brevis_wid# := 2 staff_space#;
 
 def draw_brevis(expr brevwid) =
        save beamheight, head_width;
@@ -62,46 +72,128 @@ def draw_brevis(expr brevwid) =
 
 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("Brevis notehead", "-1", "brevisball")
-       draw_brevis(brevis_wid#);
-fet_endchar;
-fet_beginchar("Brevis ledger", "-1l", "brevisledger")
-       draw_ledger(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
+% the left, some say right. Right wins democratically.
 %
-fet_beginchar("Longa notehead", "-2", "longaball");
-       draw_brevis(brevis_wid#);
+def draw_longa (expr wid) =
+       draw_brevis(wid);
        save theta;
-       z7 = z5;
-       z6 - z7 = (-stem_width/2, -interline);
+
+       x7r = head_width;
+       y7 = y5;
+%      z7 = z5;
+       z6 - z7 = (stem_width/2, -staff_space);
        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);
+enddef;
+
+%
+% En wij presenteren U: de opvolgster van Emily
+%
+% (ze is wel breed)
+% 
+fet_beginchar("Maxima notehead", "-3mensural", "mensuralmaximahead");
+       draw_longa (1.3 brevis_wid#)
+fet_endchar;
+
+fet_beginchar("Longa notehead", "-2mensural", "mensurallongahead");
+       draw_longa (brevis_wid#)
+fet_endchar;
+
+fet_beginchar("Brevis notehead", "-1mensural", "mensuralbrevishead")
+       draw_brevis(brevis_wid#);
+fet_endchar;
+
+def draw_mensural_black_head (expr wid) =
+       save head_width;
+       head_width# = wid;
+       set_char_box (0, head_width#, noteheight#/2, noteheight#/2);
+
+
+       y3 = y1 =0;
+       x2 = x4 = (x1 + x3) /2;
+       define_pixels (head_width);
+       pickup pencircle scaled blot_diameter;
+       top y2 = h;
+       bot y4 = -d;
+       lft x1 = 0;
+       rt x3 = w;
+
+       filldraw z1 -- z2 -- z3 -- z4 -- cycle;
+enddef;
+
+def draw_mensural_open_head (expr wid)=
+       draw_mensural_black_head (wid);
+       save diamNW, diamSW;
+       diamNW = length (z2 - z1) + blot_diameter;
+       diamSW = length (z4 - z1) + blot_diameter;
+       
+       save hole_widthNW, hole_widthSW;
+       hole_widthNW = 0.34 diamNW ;
+       hole_widthSW + 2.6 stafflinethickness = diamSW;
+
+       (z7 + z5)/2 = (w/2, 0);
+       (z8 + z6)/2 = (w/2, 0);
+       (z6 - z5) = hole_widthNW * unitvector (z2 - z1);
+       (z7 - z6) = hole_widthSW * unitvector (z4 - z1);
+
+       labels (1,2,3,4,5,6,7,8);
+
+       unfill z5 -- z6 -- z7 -- z8 --cycle;
+enddef;
+
+fet_beginchar("Mensural open head","0mensural","mensuralminimhead")
+       draw_mensural_open_head (staff_space#);
 fet_endchar;
-fet_beginchar("Longa ledger", "-2l", "longaledger")
-       draw_ledger(brevis_wid#);
+
+fet_beginchar("Mensural open head","1mensural","mensuralsemiminimhead")
+       draw_mensural_open_head (staff_space#);
+fet_endchar;
+
+fet_beginchar("Mensural black head","2mensural","fusahead")
+       draw_mensural_black_head (staff_space#);
+fet_endchar;
+
+
+%%%%%%%%%%%%
+%
+%
+% ledger (leger) lines
+%
+fet_beginchar("Ledger ending", "ledgerending", "ledgerending")
+set_char_box (5/2 ledgerlinethickness#, 5/2 ledgerlinethickness#,
+               ledgerlinethickness#/2,ledgerlinethickness#/2);
+       pickup pencircle scaled 1.3 blot_diameter;
+
+       rt x2 = w;
+       lft x1 = -b;
+       x3 = x2;
+       bot y1 = -d;
+       y2 = y1;
+
+       top y3 = h;
+       y4 = y3;
+       x4 = x1;
+
+       filldraw z1 --- z2 --- z3 --- z4 --- cycle ;
 fet_endchar;
 
 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+%
+%
+%
+% TODO: Document these!
+
 % setup user vars
 def setup_notehead_vars =
        save a_b,err_y_a,tilt,superness;
@@ -146,9 +238,7 @@ fi
                
        enddef;
 
-% whole note
-% Wanske, p.38
-fet_beginchar("Whole notehead", "0", "wholeball")
+def draw_whole_head =
        setup_notehead_vars;
        
        a_b:=1.80;
@@ -172,17 +262,48 @@ fet_beginchar("Whole notehead", "0", "wholeball")
        notehead_calc;
        whole_notehead_width# := wd#;
        notehead_draw;
-fet_endchar;
+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;
 
-fet_beginchar("Whole ledger line", "0l", "wholeledger")
-       draw_ledger(whole_notehead_width#);
+       draw z1 -- z2;
+       draw z3 -- z4;
 fet_endchar;
 
+% whole note
+% Wanske, p.38
+fet_beginchar("Whole notehead", "0", "wholehead")
+       draw_whole_head;
+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.50; % after drawing
@@ -207,13 +328,10 @@ fet_beginchar("Half notehead", "1",
 fet_endchar;
 
 
-fet_beginchar("Half ledger", "1l", "halfledger")
-       draw_ledger(half_notehead_width#);
-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
@@ -235,92 +353,105 @@ fet_beginchar("Quart notehead", "2", "quartball")
 fet_endchar;
 
 
-fet_beginchar("Quart ledger", "2l", "quartledger")
-       draw_ledger(black_notehead_width#);
-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 = (schuif_op, 0);
-       z2l = z1l;
-%      z3l = (schuif_op + head_width/2,-head_width/2);
-       z3l = (schuif_op + head_width/2, -noteheight/2);
-       z4l = z3l;
-       z5l = (schuif_op + head_width, 0);
-       z6l = z5l;
-%      z7l = (schuif_op + head_width/2, head_width/2);
-       z7l = (schuif_op + head_width/2, noteheight/2);
-       z8l = z7l;
-       
-       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;
-enddef;
+       err_y_ai:=0;
+       err_x_bi:=-0.12;
+       inner_tilt:=tilt;
+       inner_superness:=0.80;
 
-%save uitsteek;
-% uitsteek = .25;
-harmonic_wid# := interline#;
+       b_h:= 1.03;
+       a_w:= 1.2;
 
-fet_beginchar("Harmonic notehead","harmonic","harmonicball")
-       draw_harmonic_notehead(harmonic_wid#)
+       notehead_calc;
+       half_notehead_width# := wd#;
+       notehead_draw;
 fet_endchar;
 
-fet_beginchar("Harmonic ledger", "harmonicl", "harmonicledger")
-        draw_ledger(harmonic_wid#);
+
+% 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;
-fi
 
-fet_endgroup("balls");
+fet_beginchar("Crossed notehead", "2cross", "crossedhead")
+       set_char_box(0, black_notehead_width#, noteheight#/2, noteheight#/2);
+       pickup pencircle scaled 1.5 stafflinethickness;
+       lft x1 = 0;
+       bot y1 = -d;
+       top y2 = h;
+       rt x2 = w;
+
+       draw z1 .. z2;
+       draw (z1 .. z2) yscaled -1;
+fet_endchar
+
 
+fet_endgroup("noteheads");
 define_pixels(black_notehead_width);