release: 1.1.0

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

diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index b3cadcab90e0f24014d234a20f53a32058baa2dd..f3c26b669bac6454bf2f4678185ba9ae10bb3195 100644 (file)
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -1,18 +1,17 @@
-% eindelijk.mf
-% LilyPond's own rest(s)
-
-% todo breve/longa rests
-
+% feta-eindelijk.mf -- implement rest symbols
+%
+% part of LilyPond's pretty-but-neat music font
+%
+% source file of the Feta (not the Font-En-Tja) music font
+% 
+% (c) 1997, 1998 Jan Nieuwenhuizen <janneke@gnu.org>
 
 fet_begingroup("rests");
 
 begingroup
 
-med#:=1/33designsize;
 thick#:=1/16designsize;
-define_blacker_pixels(med,thick);
-pen med_pen;
-med_pen:= pencircle scaled med;
+define_blacker_pixels(thick);
 
 rthin:=1/8*interline;
 % rthick:=2rthin;
@@ -26,12 +25,16 @@ enddef;
 %
 save stem, ball_crook_stem, ball_crook_balldiam, flare;
 
-define_pixels(stem,flare);
 % stem#:=1/8*interline#;
 stem# = 1/5interline#;
+% flare# = 2/3interline#;
+flare# = 2/3interline# - 1/8stafflinethickness#;
+
+define_pixels(stem,flare);
+
 ball_crook_stem = stem;
 ball_crook_balldiam =flare;
-flare# = 2/3interline#;
+
 
 save block_rest_y, block_rest_x;
 
@@ -40,28 +43,15 @@ block_rest_x# = 3/2 interline#;
 
 define_pixels(block_rest_y, block_rest_x);
 
-def block_rest=
-       pickup pencircle scaled blot_diameter;
-
-       bot y1 = 0;
-       top y2 = block_rest_y;
-       y3 = y2;
-       y4 = y1;
-
-       rt x1 = block_rest_x;
-       x2 = x1;
-       lft x3 = 0;
-       x4 = x3;
-       save p;
-       path p;
-       p:=z1 -- z2 -- z3 -- z4 -- cycle;
-       draw_rounded_path(p, blot_diameter);
-enddef;
+def block_rest =
+       draw_block ((0,0), (block_rest_x, block_rest_y));
+       enddef;
 
 fet_beginchar( "whole rest", "0", "wholerest");
-set_char_box(0, block_rest_x#, -interline# + block_rest_y#,  interline# );
+       set_char_box(0, block_rest_x#,
+               block_rest_y#,  0);
        block_rest;
-       currentpicture := currentpicture shifted (0,interline - block_rest_y);
+       currentpicture := currentpicture shifted (0,- block_rest_y);
 fet_endchar;
 
 fet_beginchar("half rest", "1", "halfrest");
@@ -75,22 +65,47 @@ fet_endchar;
 %
 fet_beginchar( "whole rest (outside staff)", "0o", "outsidewholerest");
        set_char_box(block_rest_y#, block_rest_x# + block_rest_y#, 
-               -interline# + block_rest_y#, interline#);
+               block_rest_y#, ledgerlinethickness#/2);
        block_rest;
-       currentpicture := currentpicture shifted (0,interline - block_rest_y);
+       currentpicture := currentpicture shifted (0, - block_rest_y);
        pickup pencircle scaled ledgerlinethickness;
-       draw (-block_rest_y, interline) 
-             .. (block_rest_x + block_rest_y, interline);
+
+       y5 = y6 = 0;
+       lft x5 = - b; 
+       rt x6 = w;
+       draw z5 .. z6;
 fet_endchar;
 
 fet_beginchar("half rest (outside staff)", "1o", "outsidehalfrest");
        set_char_box(block_rest_y#, block_rest_x#+ block_rest_y#, 
-               0, block_rest_y#);
+               ledgerlinethickness#/2, block_rest_y#);
        block_rest;
        pickup pencircle scaled ledgerlinethickness;
-       draw (-block_rest_y,0) .. (block_rest_x + block_rest_y,0);
+       y5 = y6 = 0;
+       lft x5 = - b; 
+       rt x6 = w;
+       draw z5 .. z6;
 fet_endchar;
 
+
+save breve_rest_y, breve_rest_x;
+
+breve_rest_y# =  interline#;
+breve_rest_x# = 3/5 interline#;
+
+define_pixels(breve_rest_y, breve_rest_x);
+
+fet_beginchar("breve rest", "-1", "breverest");
+       set_char_box(0, breve_rest_x#, 0, breve_rest_y#);
+       draw_block ((0,0), (breve_rest_x, breve_rest_y));
+fet_endchar;
+
+fet_beginchar("longa rest", "-2", "longarest");
+       set_char_box(0, breve_rest_x#, breve_rest_y#, breve_rest_y#);
+       draw_block ((0,-breve_rest_y), (breve_rest_x, breve_rest_y));
+fet_endchar;
+
+
 fet_beginchar("Quarter rest","2","quartrest");
        save alpha;
        alpha:=-50;
@@ -132,7 +147,7 @@ def rest_crook(expr a, w) =
 enddef;
 
 fet_beginchar("8th rest","3","eighthrest");
-       set_char_box(0, 4/3interline#,-interline#, 8/3interline#+2stafflinethickness#);
+       set_char_box(0, 4/3interline#,-interline#, 8/3interline#+7/4stafflinethickness#);
        save x,y, ht;
        ht = h + d;
        x1=w-stem/6; y1=ht-flare/4;
@@ -144,15 +159,12 @@ fet_beginchar("8th rest","3","eighthrest");
        currentpicture:=currentpicture shifted (0,interline);
        fet_endchar;
 
-def tand(expr alpha) = 
-       (sind alpha/cosd alpha);
-       enddef;
-
 fet_beginchar("16th rest","4","sixteenthrest");
        save alpha,cw,h,w;
        alpha=74;
        cw#=7/6interline#;
-       h#=5/3interline#+interline#+2stafflinethickness#;
+%      h#=5/3interline#+interline#+2stafflinethickness#;
+       h#=5/3interline#+interline#+7/4stafflinethickness#;
        w#=cw#+(h#-3/2interline#)/tand(alpha);
        set_char_box(0,w#,0,h#);
        define_pixels(cw);
@@ -172,7 +184,7 @@ fet_beginchar("32th rest","5","thirtysecondrest");
        save alpha,cw,h,w;
        alpha=76;
        cw#=7/6interline#;
-       h#=5/3interline#+2interline#+2stafflinethickness#;
+       h#=5/3interline#+2interline#+7/4stafflinethickness#;
        w#=cw#+(h#-3/2interline#)/tand(alpha);
        set_char_box(0,w#,0,h#);
        define_pixels(cw);
@@ -194,7 +206,7 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
        save alpha,cw,h,w;
        alpha=78;
        cw#=7/6interline#;
-       h#=5/3interline#+3interline#+2stafflinethickness#;
+       h#=5/3interline#+3interline#+7/4stafflinethickness#;
        w#=cw#+(h#-3/2interline#)/tand(alpha);
        set_char_box(0,w#,0,h#);
        define_pixels(cw);
@@ -213,13 +225,15 @@ fet_beginchar("64th rest","6","sixtyfourthrest");
        z5-z1=whatever*dir alpha;
        y5=y1-3interline;
        rest_crook (z5,cw);
+       % ugh
+       currentpicture:=currentpicture shifted (0,-interline);
        fet_endchar;
 
 fet_beginchar("128th rest","7","hundredtwentyeighthrest"); 
        save alpha,cw,h,w;
        alpha=78;
        cw#=7/6interline#;
-       h#=5/3interline#+4interline#+2stafflinethickness#;
+       h#=5/3interline#+4interline#+7/4stafflinethickness#;
        w#=cw#+(h#-3/2interline#)/tand(alpha);
        set_char_box(0,w#,0,h#);
        define_pixels(cw);
@@ -241,6 +255,8 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest");
        z6-z1=whatever*dir alpha;
        y6=y1-4interline;
        rest_crook (z6,cw);
+       % ugh
+       currentpicture:=currentpicture shifted (0,-interline);
        fet_endchar;
 
 endgroup;