release: 1.3.18

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

diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf
index 7f0dae4fbe94e3295b991b13ab31aba36e93e0a0..413ecf5b9e3d3d7e90cd2fc5c13b448565a8320f 100644 (file)
--- a/mf/feta-slag.mf
+++ b/mf/feta-slag.mf
@@ -4,16 +4,23 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1998 Jan Nieuwenhuizen <jan@digicash.com>
+% (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 
 % this file is included by feta-scripts.mf
 
-tfat := 0.3;
-twidth# := 0.5interline#;
-theight# := 0.55interline#;
-tthin# := stafflinethickness#;
-toverlap# := tfat*twidth#+tthin#;
+tfat := 1/2;
+%twidth# := 0.5interline#;
+%theight# := 0.55interline#;
+% tthin# := stafflinethickness#;
+tthin# := 1.6stafflinethickness#;
+
+twidth# := 2/3interline#;
+theight# := 1/2interline#;
+
+% uhg/ uhuh?
+% toverlap# := tfat*twidth#+tthin#;
+toverlap# := tfat*twidth#+0.45tthin#;
 define_pixels(twidth,theight,tthin,toverlap);
 
 def draw_trillelement = 
@@ -22,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);
@@ -100,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);
 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#);
        draw_trill_three;
-       draw_mordent(twidth-toverlap);
+       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+1.5tthin,-tfat*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;
 fet_endchar;
@@ -125,8 +139,10 @@ 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);
-       currentpicture := currentpicture shifted (-0.5w+1.5tthin,-tfat*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;
 fet_endchar;