From: fred <fred>
Date: Sun, 24 Mar 2002 19:59:58 +0000 (+0000)
Subject: lilypond-0.1.21
X-Git-Tag: release/1.5.59~3754
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4bcdd57de73ae6312aee9cd61bf3fca3c10a11a7;p=lilypond.git

lilypond-0.1.21
---

diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly
index 0ff3a8cdc0..a2984b2481 100644
--- 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.3
-% on Wed Oct  8 16:18:13 1997
+% on Thu Oct  9 11:15:46 1997
 % Do not edit
 
 % input from out/font-en-tja16.log
@@ -34,7 +34,7 @@
         "2" "\quartball" -0.00\pt 5.28\pt -2.20\pt 2.20\pt 
         }
     "foobars"  = \table {
-        "ufermata" "\ufermata" -6.30\pt 6.30\pt -0.00\pt 6.80\pt 
+        "ufermata" "\ufermata" -6.30\pt 6.30\pt -0.30\pt 6.80\pt 
         "dfermata" "\dfermata" -6.30\pt 6.30\pt -6.80\pt 0.00\pt 
         "accent" "\sforzatoaccent" -3.60\pt 3.60\pt -2.00\pt 2.00\pt 
         "staccato" "\staccato" -0.50\pt 0.50\pt -0.50\pt 0.50\pt 
@@ -48,6 +48,7 @@
         "upbow" "\upbow" -2.60\pt 2.60\pt -0.00\pt 7.80\pt 
         "downbow" "\downbow" -3.50\pt 3.50\pt -0.00\pt 4.00\pt 
         "turn" "\turn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt 
+        "utrill" "\utrill" -0.00\pt 8.00\pt -0.00\pt 6.00\pt 
         }
     "floogbars"  = \table {
         "3u" "\eighthflag" -0.20\pt 5.17\pt -12.77\pt 0.20\pt 
diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly
index 4746d6ce47..fcffbad34e 100644
--- 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.3
-% on Wed Oct  8 16:18:16 1997
+% on Thu Oct  9 11:15:50 1997
 % Do not edit
 
 % input from out/font-en-tja20.log
@@ -34,7 +34,7 @@
         "2" "\quartball" -0.00\pt 6.61\pt -2.75\pt 2.75\pt 
         }
     "foobars"  = \table {
-        "ufermata" "\ufermata" -7.88\pt 7.88\pt -0.00\pt 8.50\pt 
+        "ufermata" "\ufermata" -7.88\pt 7.88\pt -0.38\pt 8.50\pt 
         "dfermata" "\dfermata" -7.88\pt 7.88\pt -8.50\pt 0.00\pt 
         "accent" "\sforzatoaccent" -4.50\pt 4.50\pt -2.50\pt 2.50\pt 
         "staccato" "\staccato" -0.63\pt 0.63\pt -0.63\pt 0.63\pt 
@@ -48,6 +48,7 @@
         "upbow" "\upbow" -3.25\pt 3.25\pt -0.00\pt 9.75\pt 
         "downbow" "\downbow" -4.38\pt 4.38\pt -0.00\pt 5.00\pt 
         "turn" "\turn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt 
+        "utrill" "\utrill" -0.00\pt 10.00\pt -0.00\pt 7.50\pt 
         }
     "floogbars"  = \table {
         "3u" "\eighthflag" -0.25\pt 6.46\pt -15.91\pt 0.25\pt 
diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 97c2dabc0a..7fa8ffd6b7 100644
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -7,6 +7,7 @@ input feta-params;
 
 
 test:=	0;
+
 if test = 0: 
 	input feta-eindelijk;
 	input feta-toevallig;
diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index 4600513b99..bd156643ff 100644
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -19,7 +19,7 @@ def draw_fermata =
 
 	radius# + crook_fatness#/2 = h#;
 	radius# + crook_thinness#/2 = w#;
-	set_char_box(w#, w#, 0, h#);
+	set_char_box(w#, w#, crook_thinness#/2, h#);
 	
 	define_pixels(radius, crook_thinness, crook_fatness);
 	dot_diam = 4/3 crook_fatness;
@@ -269,9 +269,9 @@ fet_beginchar("Downbow", "downbow", "downbow")
 fet_endchar;
 
 %
-% FIXME the middle part (NW -> SE) may have some more (ok; it is
-% negative: less) slope
+% Inspired by a computer-set version of auf dem Strom by Baerenreiter. 
 %
+
 fet_beginchar("Turn","turn","turn")
 	save thin, thick, ball_diam, darkness;
 	save wd, ht, thick_nibangle, ball_nib_thick;
@@ -280,7 +280,7 @@ fet_beginchar("Turn","turn","turn")
 
 	wd# = 35/16 interline#;
 	ht# = 18/17 interline#;
-	darkness = 1.3 stafflinethickness;
+	darkness = 1.25 stafflinethickness;
 
 	set_char_box(wd#/2, wd#/2, ht#/2, ht#/2);
 
@@ -326,4 +326,114 @@ fet_beginchar("Turn","turn","turn")
 	
 fet_endchar;
 
+
+ 
+
+def draw_bulb(expr zl, zr, center_factor, radius_factor)=
+	begingroup;
+	clearxy;
+	save rad, ang;
+
+	ang = angle(zr-zl);
+	z0 = center_factor [zr, zl];
+	rad = center_factor * length(zr-zl);
+	
+	z1 = z0 + radius_factor* rad * dir(ang - 100);
+	z2 = z0 + rad * dir(ang - 270);
+	labels(0,1,2);
+	fill zr{dir (ang - 90)} .. z1 .. z2 -- cycle;
+
+	endgroup
+enddef;
+
+fet_beginchar("Trill (`tr')","utrill","utrill")
+	
+	save start_angle,  ascender_extra, ex, hair_thick, fatness,
+	  slant_angle, slant, t_fatness, r_fatness, kerning;
+	pair slant_vec;
+
+	define_pixels(ex, ascender_extra, ascender);
+	ascender_extra# = 1/2 ex#;
+	ascender# = ascender_extra# + ex#;
+	ex# = interline#;
+
+	fatness = 12/40 ex;
+	t_fatness = 8/10 fatness;
+	r_fatness = 8/10 fatness;
+
+	hair_thick = 2/3 blot_diameter;
+
+
+	y1 = ascender;
+	x1l = 0;
+	x1r = t_fatness;
+	penpos1(start_nib_wid, 25);
+	
+	z2 = (x1, 7/18 ex);
+	penpos2(start_nib_wid, 25);
+
+	z3l = (11/10 t_fatness, 0);
+
+	z4l = (13/6 t_fatness, 3/8 ex);
+	penpos4(hair_thick, 180);
+
+	1.9 [z3l, z3r] = z4r;
+	z3 = .5 [z3l, z3r];
+
+
+	
+	save t_p, krul_p;
+	path t_p, krul_p, r_p;
+
+
+	t_p := z1l -- z2l{down} .. z3l{right} .. z4l{up} -- z4r{down} 
+		.. z3r{left} .. z2r{up} .. z1r -- cycle;
+	fill t_p ;
+
+	krul_ang = 32;
+
+	pickup pencircle scaled hair_thick;
+
+	z5 = (t_fatness/2, 2/3 ex);
+	
+	lft x6 = -18/40 ex;
+	y6 =  y5 - 1/20 ex;
+
+	z7 = (2 t_fatness, ex);
+
+	krul_p := z4{up} .. tension 1.1 .. z5  .. {down}z6
+		.. tension 1.1 .. z5 --- z7;
+	draw krul_p;
+
+	penpos7(hair_thick, angle (z7-z5) + 90);
+
+	z8l = (2 t_fatness + 2 hair_thick, ex);
+	penpos8(2 hair_thick, 35);
+
+	y9 = 3/4 ex;
+	x9l = 2.8 t_fatness;
+	penpos9(r_fatness, 0);
+
+	x10 = x9;
+	y10 = 0;
+	penpos10(r_fatness, 0);
+
+	r_p := z7l{z7-z5} .. z8l{right} .. z9l{down} --- z10l -- z10r
+		--- z9r{up} 
+		..  z8r{left} ..  z7r{z5-z7} -- cycle;
+	fill r_p;
+	set_char_box(0,2 interline#, 0,ascender#);
+
+
+	penpos11(1/4 r_fatness, -20);
+	z11r = z9r;
+	
+	z13 = (x9 + 2 r_fatness, y11 + 1/16 ex);
+	penpos13(r_fatness, 180);
+	fill z11r{dir 70} .. z13r{down} -- z13l{up} .. z11l{dir 250} -- cycle;
+	penlabels(range 1 thru 15);
+
+	draw_bulb(z13r, z13l, 0.5, 1.5);
+fet_endchar;
+
 fet_endgroup("foobars");
diff --git a/mf/foo.mf b/mf/foo.mf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tex/font-en-tja16.tex b/tex/font-en-tja16.tex
index 4793b3cdce..e09b104022 100644
--- 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.3
-% on Wed Oct  8 16:18:13 1997
+% on Thu Oct  9 11:15:46 1997
 % Do not edit
 
 % input from out/font-en-tja16.log
@@ -48,8 +48,9 @@
 \fetdef\upbow{32}
 \fetdef\downbow{33}
 \fetdef\turn{34}
+\fetdef\utrill{35}
 
 % floogbars
-\fetdef\eighthflag{35}
-\fetdef\deighthflag{36}
+\fetdef\eighthflag{36}
+\fetdef\deighthflag{37}
 
diff --git a/tex/font-en-tja20.tex b/tex/font-en-tja20.tex
index 4739128ba7..ff33516f8c 100644
--- 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.3
-% on Wed Oct  8 16:18:16 1997
+% on Thu Oct  9 11:15:50 1997
 % Do not edit
 
 % input from out/font-en-tja20.log
@@ -48,8 +48,9 @@
 \fetdef\upbow{32}
 \fetdef\downbow{33}
 \fetdef\turn{34}
+\fetdef\utrill{35}
 
 % floogbars
-\fetdef\eighthflag{35}
-\fetdef\deighthflag{36}
+\fetdef\eighthflag{36}
+\fetdef\deighthflag{37}