release: 0.1.54

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

diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf
index 7d9ea0b295d1b4306a44d42c89baa20d44d1fedd..2f0e762b4d064c64f77d3490b6b4fb0eb247a348 100644 (file)
--- a/mf/feta-slag.mf
+++ b/mf/feta-slag.mf
@@ -9,8 +9,7 @@
 
 % this file is included by feta-scripts.mf
 
-% tfat := 0.3;
-tfat := 1/3;
+tfat := 1/2;
 twidth# := 0.5interline#;
 theight# := 0.55interline#;
 % tthin# := stafflinethickness#;
@@ -27,7 +26,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);
@@ -121,8 +121,10 @@ 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#,-1);
+%      currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+       draw_slur(0,-2theight#,-1);
+       currentpicture := currentpicture shifted (-0.5w+1.3tthin,-tfat*theight+1.5tthin);
 %      draw_trill_four;
        draw_trill_three;
 fet_endchar;
@@ -130,8 +132,9 @@ 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+tthin,-tfat*theight+0.5tthin);
+%      draw_slur(-2twidth#,2theight#,1);
+       draw_slur(0,2theight#,1);
+       currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
        draw_trill_three;
 fet_endchar;