lilypond-0.1.28

diff --git a/init/feta20.ly b/init/feta20.ly
index 9d3e1e2de5934302eb842aa3ba08fba3c9bc9ce5..293a6f87010cf71866a8bd0d8c16968bd26c1742 100644 (file)
--- a/init/feta20.ly
+++ b/init/feta20.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Oct 29 09:54:07 1997
+% on Wed Oct 29 16:41:35 1997
 % Do not edit
 % input from out/feta20.log
 % name=\symboltables {

diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly
index 1e6b32a3441458d47a6b44024b6dc40aca949abd..f22e289f7f9cf9ddb32b9b941407d9e0d9f93bda 100644 (file)
--- a/init/font-en-tja16.ly
+++ b/init/font-en-tja16.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Tue Oct 28 12:14:59 1997
+% on Tue Oct 28 20:43:44 1997
 % Do not edit
 % input from out/font-en-tja16.log
 % name=\symboltables {

diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly
index e96c126c3dcb9a86e5fd0981d81ab2640d6c016d..cab88471c54e587530ac149b26bbfc3a2f26ab46 100644 (file)
--- a/init/font-en-tja20.ly
+++ b/init/font-en-tja20.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Tue Oct 28 12:15:08 1997
+% on Tue Oct 28 20:44:01 1997
 % Do not edit
 % input from out/font-en-tja20.log
 % name=\symboltables {

diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf
index 1eba2a6ce441e32a265cd1739bd49c0baa641c2b..8c411fb3820b4f70df4a2da0a430d3236cc0dc6a 100644 (file)
--- a/mf/feta-sleur.mf
+++ b/mf/feta-sleur.mf
@@ -1,22 +1,49 @@
-% feta-sleur.mf
-
+% feta-sleur.mf 
 mode_setup;
 thin:=.2pt;
 thick:=5thin;
-bow:=.2;
+ybow:=.2;
+abow:=1.5;
+
+def draw_slur(expr a,b,d) =
+       beginchar(0,0,0,0) "Embedded mf";
+               % huh, factor 8?
+               z1=8a;
+               z2=8b;
+               save alpha; alpha=angle(z2-z1);
+               save len; len=length(z2-z1);
+               z3=(0,0);
+               z4=(len/2,len*ybow*d);
+               z5=(len,0);
+               save beta; beta=abow*angle(z4-z3);
+               penpos3(thin,90+beta);
+               penpos4(thick,90);
+               penpos5(thin,90-beta);
+               pickup pencircle;
+               path boogje;
+               boogje = z3l{dir(beta)}..z4l{right}..z5l{dir(-beta)}
+                       ..z5r{dir(180-beta)}..z4r{left}
+                       ..z3r{dir(180+beta)}..cycle;
+               penlabels(1,2,3,4,5);
+               boogje := boogje rotated alpha;
+               % silly mo*tex convenction
+%              boogje := boogje shifted ((x1-x2)/2,0);
+               fill boogje;
+               endchar;
+       enddef;
 
 def sign(expr a) =
        ((abs(a))/(a))
        enddef;
 
-def draw_slur(expr a,b,d) =
+def xdraw_slur(expr a,b,d) =
        beginchar(0,0,0,0) "Embedded mf";
                % huh, factor 8?
                z1=8a;
                z3=8b;
                save alpha; alpha=angle(z3-z1);
-               z2=(1/2[x1,x3],1/2[y1,y3])+d*bow*(x3-x1)*dir(alpha+90);
-               save beta; beta=d*sign(y3-y1)*1.5angle(z2-z1)-alpha;
+               z2=(1/2[x1,x3],1/2[y1,y3])+d*ybow*(x3-x1)*dir(alpha+90);
+               save beta; beta=d*sign(y3-y1)*abow*angle(z2-z1)-alpha;
 %              message "d: "&decimal d;
 %              message "dy: "& decimal sign(y3-y1);
 %              message "alpha: "&decimal alpha;
@@ -25,8 +52,9 @@ def draw_slur(expr a,b,d) =
                penpos2(thick,alpha+90);
                penpos3(thin,alpha-beta+90);
                pickup pencircle;
-               fill z1l{dir(alpha+beta)}..z2l{dir(alpha)}..z3l{dir(alpha-beta)}
-                       ..z3r{dir(180+alpha-beta)}..z2r{dir(180+alpha)}..z1r{dir(180+alpha+beta)}
+               fill z1l{dir(alpha+beta)}..z2l{dir(alpha)}
+                       ..z3l{dir(alpha-beta)}..z3r{dir(180+alpha-beta)}
+                       ..z2r{dir(180+alpha)}..z1r{dir(180+alpha+beta)}
                        ..cycle;
                penlabels(1,2,3);
                endchar;

diff --git a/tex/feta16.tex b/tex/feta16.tex
index 374dd6f6fe67c114f7364faab307b3cb2944bcc0..3e54e30867392e2f172dbc6173d70230d80999df 100644 (file)
--- a/tex/feta16.tex
+++ b/tex/feta16.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Oct 29 09:54:00 1997
+% on Wed Oct 29 16:41:31 1997
 % Do not edit
 % input from out/feta16.log
 % name

diff --git a/tex/feta20.tex b/tex/feta20.tex
index a4649fd93edec0b8118f6c6ebd18f4911b7663f3..f86bcfaec3618cbd51784e5b9e97d1c746e54446 100644 (file)
--- a/tex/feta20.tex
+++ b/tex/feta20.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Oct 29 09:54:07 1997
+% on Wed Oct 29 16:41:35 1997
 % Do not edit
 % input from out/feta20.log
 % name

diff --git a/tex/font-en-tja16.tex b/tex/font-en-tja16.tex
index 4f32c7757488267950c21e9d02ae2a1ad7dbe9c5..80ca21d7c6322fff01887a21a74e0e0df231f7dc 100644 (file)
--- a/tex/font-en-tja16.tex
+++ b/tex/font-en-tja16.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Tue Oct 28 12:14:59 1997
+% on Tue Oct 28 20:43:44 1997
 % Do not edit
 % input from out/font-en-tja16.log
 % name

diff --git a/tex/font-en-tja20.tex b/tex/font-en-tja20.tex
index 3222e2b9bf783278b98cb76a6f3c60c2cc1e9848..7cdab661586191713c818fe3c63ce1bbe160c581 100644 (file)
--- a/tex/font-en-tja20.tex
+++ b/tex/font-en-tja20.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Tue Oct 28 12:15:08 1997
+% on Tue Oct 28 20:44:01 1997
 % Do not edit
 % input from out/font-en-tja20.log
 % name