release: 1.5.29

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

diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf
index 7d9ea0b295d1b4306a44d42c89baa20d44d1fedd..c94d379dd83bc4bcfbbaa49308768c2760791c37 100644 (file)
--- a/mf/feta-slag.mf
+++ b/mf/feta-slag.mf
@@ -4,18 +4,20 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1998 Jan Nieuwenhuizen <jan@digicash.com>
+% (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 
 % this file is included by feta-scripts.mf
 
-% tfat := 0.3;
-tfat := 1/3;
-twidth# := 0.5interline#;
-theight# := 0.55interline#;
+tfat := 1/2;
+%twidth# := 0.5staff_space#;
+%theight# := 0.55staff_space#;
 % tthin# := stafflinethickness#;
 tthin# := 1.6stafflinethickness#;
 
+twidth# := 2/3staff_space#;
+theight# := 1/2staff_space#;
+
 % uhg/ uhuh?
 % toverlap# := tfat*twidth#+tthin#;
 toverlap# := tfat*twidth#+0.45tthin#;
@@ -27,7 +29,8 @@ def draw_trillelement =
        pickup pencircle scaled tthin;
        
        lft x1 = -twidth;
-       x3 = -tfat*twidth;
+%      x3 = -1/3*twidth;
+       x3 = -0.3*twidth;
        top y3 = theight;
 
        z3 - z1 = whatever * (0.5twidth, theight);
@@ -90,7 +93,7 @@ fet_endchar;
 
 fet_beginchar("mordent", "mordent", "mordent")
        trills := 2;
-       set_char_box(trills*twidth#-0.5toverlap#, trills*twidth#-0.5toverlap#, theight#, theight#);
+       set_char_box(trills*twidth#-0.5toverlap#, trills*twidth#-0.5toverlap#, 4/3*theight#, 4/3*theight#);
        draw_trill_two;
        draw_mordent(0);
 fet_endchar;
@@ -105,24 +108,30 @@ fet_beginchar("prallprall", "prallprall", "prallprall")
        trills := 3;
        set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#);
        draw_trill_three;
-       draw_mordent(twidth-0.5toverlap);
 fet_endchar;
 
 fet_beginchar("prallmordent", "prallmordent", "prallmordent")
        trills := 3;
-       set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#);
+       set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, 4/3*theight#, 4/3*theight#);
        draw_trill_three;
        draw_mordent(twidth-0.5toverlap);
 fet_endchar;
 
 input feta-sleur;
 
+%
+% URG.   The attached slurs look weird, and discontinuous in their connection to the 
+% main part.  --hwn
+
 fet_beginchar("upprall", "upprall", "upprall")
 %      trills := 4;
        trills := 3;
        set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#);
-       draw_slur(-2twidth#,-2theight#,-1);
-       currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin);
+%      draw_slur(-2twidth#,-2theight#,0,-1);
+%      currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+       draw_slur(0,-2theight#,0,-1);
+%      currentpicture := currentpicture shifted (-0.5w+1.3tthin,-tfat*theight+1.5tthin);
+       currentpicture := currentpicture shifted (-0.5w+1.65tthin,-tfat*theight+1.15tthin);
 %      draw_trill_four;
        draw_trill_three;
 fet_endchar;
@@ -130,8 +139,68 @@ fet_endchar;
 fet_beginchar("downprall", "downprall", "downprall")
        trills := 3;
        set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#);
-       draw_slur(-2twidth#,2theight#,1);
+%      draw_slur(-2twidth#,2theight#,0,1);
+       draw_slur(0,2theight#,0,1);
+%      currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+       currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin);
+       draw_trill_three;
+fet_endchar;
+
+fet_beginchar("upmordent", "upmordent", "upmordent")
+%      trills := 4;
+       trills := 3;
+       set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, 4/3*theight#, 4/3*theight#);
+%      draw_slur(-2twidth#,-2theight#,0,-1);
+%      currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+       draw_slur(0,-2theight#,0,-1);
+%      currentpicture := currentpicture shifted (-0.5w+1.3tthin,-tfat*theight+1.5tthin);
+       currentpicture := currentpicture shifted (-0.5w+1.65tthin,-tfat*theight+1.15tthin);
+%      draw_trill_four;
+       draw_trill_three;
+       draw_mordent(twidth-0.5toverlap);
+fet_endchar;
+
+fet_beginchar("downmordent", "downmordent", "downmordent")
+       trills := 3;
+       set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, 4/3*theight#, 4/3*theight#);
+%      draw_slur(-2twidth#,2theight#,0,1);
+       draw_slur(0,2theight#,0,1);
+%      currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+       currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin);
+       draw_trill_three;
+       draw_mordent(twidth-0.5toverlap);
+fet_endchar;
+
+fet_beginchar("lineprall", "lineprall", "lineprall")
+       trills := 3;
+       set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, 4*theight#);
+       pickup pencircle scaled tthin;
+       draw (-0.5w+tthin,-tfat*theight+0.5tthin) -- (-0.5w+tthin,h);
+       draw_trill_three;
+fet_endchar;
+
+fet_beginchar("pralldown", "pralldown", "pralldown")
+%      trills := 4;
+       trills := 3;
+       set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#);
+%      draw_slur(-2twidth#,-2theight#,0,-1);
+%      currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+       draw_slur(0,-2theight#,0,-1);
+%      currentpicture := currentpicture shifted (-0.5w+1.3tthin,-tfat*theight+1.5tthin);
+       currentpicture := currentpicture shifted (-0.5w+1.65tthin,-tfat*theight+1.15tthin);
+%      draw_trill_four;
+       draw_trill_three;
+       currentpicture := currentpicture xscaled -1;
+fet_endchar;
+
+fet_beginchar("prallup", "prallup", "prallup")
+       trills := 3;
+       set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#);
+%      draw_slur(-2twidth#,2theight#,0,1);
+       draw_slur(0,2theight#,0,1);
+%      currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
        currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin);
        draw_trill_three;
+       currentpicture := currentpicture xscaled -1;
 fet_endchar;