* ly/engraver-init.ly (HaraKiriStaffContext): use

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

diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf
index a1385857af9f8388f1d977a5a1cd640329b40dbe..e1b9321a684a208d0068e72e497bf03d782b9a5d 100644 (file)
--- a/mf/feta-sleur.mf
+++ b/mf/feta-sleur.mf
@@ -3,15 +3,16 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
-% & Han-Wen Nienhuys <hanwen@stack.nl>
+% (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
+% see Documentation/fonts.tex
 
 % mode_setup;
 
 %% staffsize#=16pt#;
-% interline#:=staffsize#/4;
-% stafflinethickness#:=0.1interline#;
+% staff_space#:=staffsize#/4;
+% stafflinethickness#:=0.1staff_space#;
 
 pi:=3.14159;
 
@@ -19,34 +20,17 @@ def atan(expr x) =
        (angle(1,x)*pi/180)
        enddef;
 
-%breapth, width, depth, height
-
-% urgh
-% having mf would be nice if only from a "use the source" point of view.
-%
-% getslurcontrol:
-%        slurhtlimit 90 div /slur_alpha exch def
-%        slurratio 60 div slur_alpha div  /slur_beta  exch def
-%        slur_beta mul 1 atan slur_alpha mul
-%
-% draw_slur:
-%        slur_b getslurcontrol 
-%        slur_dir mul /slur_ht exch def
-%        slur_b getslurcontrol /slur_indent exch def       
-%
 
 sleur_pen#:=stafflinethickness#;
 slurheightlimit#:=staffsize#/2;
-% staffrulethickness 1.5 mul  /slur_thick exch def
-slurthick#:=3/2stafflinethickness#;
+slurthick#:=1.8stafflinethickness#;
 
-define_pixels(staffsize,interline,stafflinethickness);
+define_pixels(staffsize,staff_space,stafflinethickness);
 define_pixels(sleur_pen,slurheightlimit,slurthick);
 
-sluralpha:=slurheightlimit#*pi/2;
-% slurratio:=1/3;
-slurratio:=0.3333;
-slurbeta:=3/4*pi*slurratio/sluralpha;
+sluralpha:=2slurheightlimit#/pi;
+slurratio:=1/3;
+slurbeta:=pi*slurratio/2slurheightlimit#;
 
 def draw_slur(expr dxs,dys,hs,d) =
        save x, y;
@@ -56,8 +40,7 @@ def draw_slur(expr dxs,dys,hs,d) =
        h#:=hs*1pt#;
        define_pixels(dx,dy);
        b#:=length(dx#,dy#);
-       % ugh: huh? 2/5
-       indent#:=2/5*sluralpha*atan(slurbeta*b#);
+       indent#:=sluralpha*atan(slurbeta*b#);
        define_pixels(b,h,indent);
        height:=(indent+h)*d;
        z1=(0,0);
@@ -71,19 +54,6 @@ def draw_slur(expr dxs,dys,hs,d) =
        boogje:=boogje rotated angle(dxs,dys);
        pickup pencircle scaled sleur_pen;
        filldraw boogje;
-       show z1;
-       show z2;
-       show z3;
-       show z4;
-       show z5;
-       show z6;
-enddef;
-
-def slurchar(expr dxs,dys,hs,d) =
-       beginchar(0,0,0,0) "Embedded mf";
-       draw_slur(dxs,dys,hs,d);
-       endchar;
 enddef;
 
-% drawslur(10,10,0,1);