patch::: 1.3.84.jcn1

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

diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf
index 2f0e762b4d064c64f77d3490b6b4fb0eb247a348..060e4537c5a607e772b992bdbc1b62d1128c2553 100644 (file)
--- a/mf/feta-slag.mf
+++ b/mf/feta-slag.mf
@@ -4,17 +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--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 
 % this file is included by feta-scripts.mf
 
 tfat := 1/2;
-twidth# := 0.5interline#;
-theight# := 0.55interline#;
+%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#;
@@ -105,7 +108,6 @@ 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")
@@ -117,14 +119,19 @@ 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);
+%      draw_slur(-2twidth#,-2theight#,0,-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_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;
@@ -132,9 +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);
-       draw_slur(0,2theight#,1);
-       currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+%      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;