]> git.donarmstrong.com Git - lilypond.git/blobdiff - mf/feta-schrift.mf
release: 1.3.44
[lilypond.git] / mf / feta-schrift.mf
index 794208902e39b09f41ca236642ad0d96c3125df3..b72653b4adca3bbd42124292c43041f581c4a429 100644 (file)
@@ -4,7 +4,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 %      Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 
@@ -19,7 +19,7 @@ def draw_fermata =
        % suggest ca 80 degrees iso half-circle
   alpha := 10;
 
-  radius# = 1.25 interline#;
+  radius# = 1.25 staff_space#;
   crook_thinness# = 1.5stafflinethickness#;
   crook_fatness# = 4 stafflinethickness#;
 
@@ -67,12 +67,12 @@ fet_endchar;
 fet_beginchar("Thumb", "thumb", "thumb")
         save thin, height, width, thick;
         height# = 5/4 width#;
-        height# = interline#;
+        height# = staff_space#;
         thin = 1.2 stafflinethickness;
-        thick =  1.4 thin;
+        thick =  2 thin;
         set_char_box(width#/2, width#/2, height#/2, height#/2);
-
-        penpos1(thick, 0);
+        
+       penpos1(thick, 0);
         penpos2(thin, 90);
         z1r = (w, 0);
         z2r = (0, h);
@@ -81,21 +81,18 @@ fet_beginchar("Thumb", "thumb", "thumb")
         addto currentpicture also currentpicture xscaled -1;
         addto currentpicture also currentpicture yscaled -1;
 
-       pickup pencircle scaled thin;
-       save x,y;
-       z3r = (0, -h);
-       z4 = (0, -2h);
+       z3 = (0, -h);
+       z4 = (0, -1.5h);
        penlabels(3,4);
-       draw z3r -- z4;
+       draw_brush(z3,1.4*thin, z4,0.9*thick);
 fet_endchar;
 
-
 %
 % FIXME: rounded endings
 %
 % `\accent' is TeX reserved.
 fet_beginchar("> accent", "sforzato", "sforzatoaccent")
-       set_char_box(.9 interline#, .9 interline#, .5 interline#, .5 interline#);
+       set_char_box(.9 staff_space#, .9 staff_space#, .5 staff_space#, .5 staff_space#);
        save thickness, diminish;
 
        thickness = 3/2 stafflinethickness;
@@ -138,7 +135,7 @@ fet_endchar;
 
 def draw_staccatissimo =
        save radius, height;
-       height# = .8 interline#;
+       height# = .8 staff_space#;
        radius# = 2 stafflinethickness#;
        define_pixels(radius, height);
 
@@ -164,7 +161,7 @@ fet_beginchar("portato/single tenuto", "tenuto", "tenuto")
        thick# = 1.4 stafflinethickness#;
        define_pixels(thick);
 
-       set_char_box(.6 interline#, .6 interline#, thick#/2,thick#/2);
+       set_char_box(.6 staff_space#, .6 staff_space#, thick#/2,thick#/2);
        pickup pencircle scaled thick;
        lft x1 = -b;
        rt x2 = w;
@@ -175,7 +172,7 @@ fet_endchar;
 
 def draw_marcato = 
        save fat_factor, thinness;
-       set_char_box(interline#/2, interline#/2, 0, 1.1 interline#);
+       set_char_box(staff_space#/2, staff_space#/2, 0, 1.1 staff_space#);
 
        fat_factor = .3;
        thinness =  stafflinethickness;
@@ -218,7 +215,7 @@ fet_endchar;
 fet_beginchar("open (unstopped)", "open", "ouvert")
        save thin, height, width, thick;
        height# = 5/4 width#;
-       height# = interline#;
+       height# = staff_space#;
        thin = 1.2 stafflinethickness;
        thick =  1.4 thin;
        set_char_box(width#/2, width#/2, height#/2, height#/2);
@@ -237,7 +234,7 @@ fet_endchar;
 fet_beginchar("plus (stopped)", "stopped", "plusstop")
        save thick, size;
        thick = 2 stafflinethickness;
-       size# = 1.1 interline#;
+       size# = 1.1 staff_space#;
 
        set_char_box(size#/2, size#/2, size#/2, size#/2);
        pickup pencircle scaled thick;
@@ -257,7 +254,7 @@ fet_beginchar("Upbow", "upbow", "upbow")
        save ht, wd, thick;
 
        thick = 1.4 stafflinethickness;
-       wd# = 1.3 interline#;
+       wd# = 1.3 staff_space#;
        ht# = 1.6 wd#; 
 
        
@@ -279,10 +276,10 @@ fet_beginchar("Downbow", "downbow", "downbow")
        save wd;
        define_pixels(wd)
 
-       wd# = 1.5 interline#;
+       wd# = 1.5 staff_space#;
        stemthick = 1.2 stafflinethickness;
 
-       set_char_box(wd#/2, wd#/2, 0, 4/3 interline#);
+       set_char_box(wd#/2, wd#/2, 0, 4/3 staff_space#);
 
        beamheight = 4/10 h;
 
@@ -320,8 +317,8 @@ def draw_turn =
        save turndir;
        pair turndir;
 
-       wd# = 35/16 interline#;
-       ht# = 18/17 interline#;
+       wd# = 35/16 staff_space#;
+       ht# = 18/17 staff_space#;
        darkness = 1.20 stafflinethickness;
 
        set_char_box(wd#/2, wd#/2, ht#/2, ht#/2);       
@@ -377,7 +374,7 @@ fet_beginchar("Turn","turn","turn")
        draw_turn;
                
        penlabels(5,6,7);
-       penlabels(2,3,4);
+       penlabels(1,2,3,4);
 fet_endchar;
 
 
@@ -402,7 +399,7 @@ fet_beginchar("Trill (`tr')","trill","trill")
 
        ascender_extra# = 1/2 ex#;
        ascender# = ascender_extra# + ex#;
-       ex# = 1.5 interline#;
+       ex# = 1.5 staff_space#;
        kerning# = .75 ex#;
        start_nib_angle = 20;
        bulb_size = 0.47;
@@ -418,7 +415,7 @@ fet_beginchar("Trill (`tr')","trill","trill")
        slant = .2;
 
        local_copy(transform)(currenttransform);
-       currenttransform := currenttransform slanted slant shifted (- interline, 0)  ;
+       currenttransform := currenttransform slanted slant shifted (- staff_space, 0)  ;
 
        y1 = ascender;
        x1l = 0;
@@ -484,7 +481,7 @@ fet_beginchar("Trill (`tr')","trill","trill")
                --- z9r{up} 
                ..  z8r{left} ..  z7r{z5-z7} -- cycle;
        fill r_p;
-       set_char_box(interline# , interline#, 0,ascender#);
+       set_char_box(staff_space# , staff_space#, 0,ascender#);
 
 
        penpos11(1/4 r_fatness, -20);
@@ -503,10 +500,10 @@ fet_endchar;
 def draw_heel =
        save radius, thickness, wall;
 
-       radius# := .5 interline#;
+       radius# := .5 staff_space#;
 
        define_pixels(radius);
-       set_char_box(radius#, radius#, radius#, 2/3 interline#);
+       set_char_box(radius#, radius#, radius#, 2/3 staff_space#);
 
        thickness := 1.5 stafflinethickness;    
        pickup pencircle scaled thickness;
@@ -539,7 +536,7 @@ def draw_toe =
        save ht,wd;
 
        thickness := 1.5 stafflinethickness;
-       ht# := 1.5 interline#;
+       ht# := 1.5 staff_space#;
        wd# := 1/3 ht#;
        define_pixels(ht,wd);
 
@@ -589,6 +586,118 @@ fet_beginchar("Flageolet", "flageolet", "flageolet")
        draw z1..z2..z3..z4..cycle;
 fet_endchar;
 
+fet_beginchar("Repeatsign", "repeatsign", "repeatsign")
+       set_char_box(staff_space#, staff_space#, staff_space#, staff_space#);
+
+       save dot_diam;
+       2 dot_diam# = staff_space# - stafflinethickness#;
+       define_pixels(dot_diam);
+
+       penpos1(dot_diam,0);
+       z1l=(-b,-d);
+       penpos2(dot_diam,0);
+       z2r=(w,h);
+       filldraw z1l--z2l{right}--z2r{down}--z1r{right}--cycle;
+        penlabels (1,2);
+
+       pickup pencircle scaled dot_diam;
+        draw (-staff_space/2, staff_space/2);
+        draw (staff_space/2, -staff_space/2);
+fet_endchar;
+
+fet_beginchar("Segno", "segno", "segno")
+       save thin, thick, ball_diam, darkness, pointheight;
+       save wd, ht, thick_nibangle, ball_nib_thick;
+       save turndir;
+       pair turndir;
+
+       ht# = 3 staff_space#;
+       wd# = 2 staff_space#;
+       darkness = 1.20 stafflinethickness;
+
+       set_char_box(wd#/2, wd#/2, ht#/2, ht#/2);       
+
+       thick_nibangle = 30;
+       thick = 3 darkness;
+       thin = darkness;
+       ball_nib_thick = 2.7 darkness;
+       ball_diam = ball_nib_thick + (w - ball_nib_thick) / 10;
+       pointheight = 2 stafflinethickness;
+       
+       y3l = h;
+       2 x3 = x2 + x4;
+       x4 = 0;
+       y4 = y2;
+       y2l = .6 h;
+       x2l = -b;
+       z1 = (0,0);
+
+       penpos1(thick, 2 thick_nibangle);
+       penpos2(thick, thick_nibangle);
+       penpos3(thin, -90);
+       penpos4(ball_nib_thick, 180-thick_nibangle);
+
+       path swoosh, ploop;
+       swoosh :=  z1l{curl 0} .. z2l .. z3l{right} .. {down}z4l 
+         -- z4r .. z3r{left} .. z2r{down} ;
+       fill swoosh .. (swoosh scaled -1) .. cycle;
+       penlabels(1,2,3,4);
+
+       y5r = y4;
+       x5r = x4l - ball_diam /2;
+       z6r = z5r;
+
+       penpos5(1.6 ball_diam/2, 100);
+       penpos6(ball_diam/2, 240);
+
+       ploop := z4l{down} .. z5l .. z6l -- cycle;
+       fill ploop;
+       fill ploop scaled -1;
+       penlabels(4,5,6);
+
+       penpos7(2 thin,0);
+       z7l=(-b,-d);
+       penpos8(2 thin,0);
+       z8r=(w,h);
+       filldraw z7l--z8l{right}--z8r{down}--z7r{right}--cycle;
+       pickup pencircle scaled 2 thin;
+       draw (-x2r,pointheight);
+       draw (x2r,-pointheight);
+fet_endchar;
+
+fet_beginchar("Coda", "coda", "coda")
+       save thin, thick, codawidth, codaheight;
+       thin# = 1.2 stafflinethickness#;
+       thick# = 3.5 stafflinethickness#;
+       codawidth# = 2/3 staff_space#;
+       codaheight# = 1 staff_space#;
+       define_pixels(thin, thick, codawidth, codaheight);
+
+       set_char_box(codawidth#+thick#, codawidth#+thick#,
+               codaheight#+thick#, codaheight#+thick#);
+
+       penpos1(thick,0);
+       penpos2(thin,-90);
+       penpos3(thick,180);
+       x1l=-codawidth;
+       y2l=codaheight;
+       y1=0;
+       x2=0;
+       z3 = - z1;
+       penlabels(1,2,3);
+
+       path halfcoda;
+       halfcoda := z1l{up} .. z2l{right} .. z3l{down} -- 
+               z3r{up} .. z2r{left} .. z1r{down} .. cycle;
+       fill halfcoda;
+       fill (halfcoda scaled -1);
+
+       pickup pencircle scaled thin;
+       draw (0,-h) -- (0,h);
+       draw (-w,0) -- (w,0);
+
+fet_endchar;
+
 input feta-slag;
 input feta-accordion;