release: 1.1.0

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

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 9a08537316b0a06d26ee5ea37ac1658f05e9a806..2c314efb6ea6cdf468ba7d95a0303ec9caba714c 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -4,8 +4,8 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-%      Jan Nieuwenhuizen <jan@digicash.com>
+% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+%      Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 
 
@@ -58,6 +58,37 @@ fet_beginchar("fermata down", "dfermata", "dfermata")
        y_mirror_char;
 fet_endchar;
 
+%
+% Thumbs are used in cello music.
+% TODO : thumbs should look like the finger-font and should be placed in
+% the same way in the score.
+%
+
+fet_beginchar("Thumb", "thumb", "thumb")
+        save thin, height, width, thick;
+        height# = 5/4 width#;
+        height# = interline#;
+        thin = 1.2 stafflinethickness;
+        thick =  1.4 thin;
+        set_char_box(width#/2, width#/2, height#/2, height#/2);
+
+        penpos1(thick, 0);
+        penpos2(thin, 90);
+        z1r = (w, 0);
+        z2r = (0, h);
+        penlabels(1,2);
+        penstroke z1e{up} .. {left}z2e;
+        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);
+       penlabels(3,4);
+       draw z3r -- z4;
+fet_endchar;
+
 
 %
 % FIXME: rounded endings
@@ -130,10 +161,10 @@ fet_endchar;
 
 fet_beginchar("portato/single tenuto", "tenuto", "tenuto")
        save thick;
-       thick# = 1.2 stafflinethickness#;
+       thick# = 1.4 stafflinethickness#;
        define_pixels(thick);
 
-       set_char_box(.9 interline#, .9 interline#, thick#/2,thick#/2);
+       set_char_box(.6 interline#, .6 interline#, thick#/2,thick#/2);
        pickup pencircle scaled thick;
        lft x1 = -b;
        rt x2 = w;
@@ -179,6 +210,7 @@ fet_beginchar("marcato down", "dmarcato", "dmarcato")
        xy_mirror_char;
 fet_endchar;
  
+
 %
 % used in french horn music todo
 %
@@ -281,7 +313,8 @@ fet_endchar;
 %
 % Inspired by a computer-set version of Auf dem Strom by Baerenreiter. 
 %
-fet_beginchar("Turn","turn","turn")
+
+def draw_turn =
        save thin, thick, ball_diam, darkness;
        save wd, ht, thick_nibangle, ball_nib_thick;
        save turndir;
@@ -291,7 +324,7 @@ fet_beginchar("Turn","turn","turn")
        ht# = 18/17 interline#;
        darkness = 1.20 stafflinethickness;
 
-       set_char_box(wd#/2, wd#/2, ht#/2, ht#/2);
+       set_char_box(wd#/2, wd#/2, ht#/2, ht#/2);       
 
        thick_nibangle = 60;
        thick = 3 darkness;
@@ -317,7 +350,6 @@ fet_beginchar("Turn","turn","turn")
        swoosh :=  z1l{curl 0} .. z2l .. z3l{up} .. {left}z4l 
          -- z4r .. z3r{down} .. z2r{left} ;
        fill swoosh .. (swoosh scaled -1) .. cycle;
-       penlabels(2,3,4);
 
        x5r = x4;
        y5r = y4l - ball_diam /2;
@@ -331,8 +363,21 @@ fet_beginchar("Turn","turn","turn")
        fill ploop scaled -1;
 
 
+enddef;
+
+fet_beginchar("Reverse turn","reverseturn","reverseturn")
+       draw_turn;
+       currentpicture := currentpicture yscaled -1;
+       penlabels(5,6,7);
+       penlabels(2,3,4);
+fet_endchar;
+
+
+fet_beginchar("Turn","turn","turn")
+       draw_turn;
+               
        penlabels(5,6,7);
-       
+       penlabels(2,3,4);
 fet_endchar;
 
 
@@ -544,4 +589,7 @@ fet_beginchar("Flageolet", "flageolet", "flageolet")
        draw z1..z2..z3..z4..cycle;
 fet_endchar;
 
+input feta-slag;
+
 fet_endgroup("scripts");
+