From: fred <fred>
Date: Sun, 24 Mar 2002 20:09:32 +0000 (+0000)
Subject: lilypond-0.1.55
X-Git-Tag: release/1.5.59~3220
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=920be2513d052ba6e83c400aecb0e3af381ea37a;p=lilypond.git

lilypond-0.1.55
---

diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf
index 2f0e762b4d..7d8f1d52ac 100644
--- a/mf/feta-slag.mf
+++ b/mf/feta-slag.mf
@@ -10,11 +10,14 @@
 % this file is included by feta-scripts.mf
 
 tfat := 1/2;
-twidth# := 0.5interline#;
-theight# := 0.55interline#;
+%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#;
@@ -121,10 +124,11 @@ 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 +136,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;
 
diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf
index 02f984975c..a1385857af 100644
--- a/mf/feta-sleur.mf
+++ b/mf/feta-sleur.mf
@@ -48,17 +48,18 @@ sluralpha:=slurheightlimit#*pi/2;
 slurratio:=0.3333;
 slurbeta:=3/4*pi*slurratio/sluralpha;
 
-def draw_slur(expr dxs,dys,d) =
+def draw_slur(expr dxs,dys,hs,d) =
 	save x, y;
-	save b, dx, dy, indent;
+	save b, dx, dy, h, indent;
 	dx#:=dxs*1pt#;
 	dy#:=dys*1pt#;
+	h#:=hs*1pt#;
 	define_pixels(dx,dy);
 	b#:=length(dx#,dy#);
 	% ugh: huh? 2/5
 	indent#:=2/5*sluralpha*atan(slurbeta*b#);
-	define_pixels(b,indent);
-	height:=indent*d;
+	define_pixels(b,h,indent);
+	height:=(indent+h)*d;
 	z1=(0,0);
 	z2=(b,0);
 	z3=(indent,height);
@@ -78,11 +79,11 @@ def draw_slur(expr dxs,dys,d) =
 	show z6;
 enddef;
 
-def slurchar(expr dxs,dys,d) =
+def slurchar(expr dxs,dys,hs,d) =
 	beginchar(0,0,0,0) "Embedded mf";
-	draw_slur(dxs,dys,d);
+	draw_slur(dxs,dys,hs,d);
 	endchar;
 enddef;
 
-% drawslur(10,10,1);
+% drawslur(10,10,0,1);
 
diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex
index 78933d0c4b..d8b40c22fe 100644
--- a/tex/lily-ps-defs.tex
+++ b/tex/lily-ps-defs.tex
@@ -123,8 +123,7 @@ def
  %  (b*ratio)/(1 + b / htlimit)
  /getslurcontrol 
  { 
- 	slurhtlimit add /slurheight exch def
-        slurheight 90 div /slur_alpha exch def
+        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
  } bind def
@@ -138,9 +137,9 @@ def
         /slur_dy exch def
         /slur_dx exch def
         slur_dy slur_dx lily_distance /slur_b  exch def
-        slur_b slur_height getslurcontrol 
+        slur_b getslurcontrol slur_height add
         slur_dir mul /slur_ht exch def
-        slur_b slur_height getslurcontrol /slur_indent exch def       
+        slur_b getslurcontrol /slur_indent exch def       
 %
         slur_dy slur_dx atan rotate
         slur_indent slur_ht