X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-timesig.mf;h=216166755baa28baafe3f73fbb10f9ff7b667fa5;hb=9193ac6225e2beafb8ea5da2610c70dd610e03be;hp=509903ad0a2822c2339655261b338bf49844c0f1;hpb=320107be585c79f30fcc7f2752f0eaea085430fc;p=lilypond.git

diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf
index 509903ad0a..216166755b 100644
--- a/mf/feta-timesig.mf
+++ b/mf/feta-timesig.mf
@@ -1,54 +1,101 @@
 % 
 % feta-timesig.mf --  implement Time Signatures
 % 
-% source file of the Feta (Font-En-Tja) music font
+% source file of the Feta (not an abbreviation of Font-En-Tja) music font
 % 
-% (c) 1998 Mats Bengtsson <matsb@s3.kth.se>
+% (c) 1998--2004 Mats Bengtsson <matsb@s3.kth.se>,
+%		 Christian Mondrup <scancm@biobase.dk>
 
 fet_begingroup("timesig");
 
+
+%
+% originally by Mats B. nuked by Han-Wen, inspired by
+% Baerenreiter BA320 (Bach Cello Suites, Suite III)
+%
+% Notes:
+% 
+%  * the inside curve of the C is rather straight.
+%  * the outside curve of the C is rather round.
+%  * right tips of the C point slightly outward
+%  * lower tip protudes to the right very slightly.
+%
+
+
 def draw_C =
-	save hair, bulb_rad;
-	hair# := .5 stafflinethickness#;
-	bulb_rad# := (interline# - stafflinethickness#) / 4;
-	define_pixels(hair, bulb_rad);
+  	save hair, bulb_rad, left_fatness;
+	save left_width, right_width;
+	save width;
+
+	width# := 1.8 staff_space#- stafflinethickness#;
+	define_pixels (width);
 
-	x1r = x5;
-	y1r = interline / 3;
-	z2r = (0, interline);
-	z3r = (-b, 0);
-	z4r = (0, -interline);
-	z5r = (w, -stafflinethickness);
+	left_width# := 1.0 staff_space#;
+	right_width# := 0.8 staff_space#;
+	define_pixels(left_width,right_width);
+  
+	hair# := stafflinethickness#;
+	bulb_rad# := 0.4 staff_space#;
+	define_pixels(hair, bulb_rad);
+	left_fatness = 0.55;
 	
-	penpos1(1.5 stafflinethickness, 0);
+	x1r - x3r = width;
+	x3r = 0.0;
+	y1r = .45 staff_space;
+	y2 = -y4 = staff_space;
+	x2 = x4;
+	x2 = x3r + staff_space;
+	y3r = 0;
+
+	x5r = x1r + 0.3 stafflinethickness;
+	y5r = -0.37 staff_space;
+	z6l = z1l;
+
+	penpos1(hair, 10);
 	penpos2(stafflinethickness, 90);
-	penpos3(3 stafflinethickness, 180);
+	penpos3(left_fatness * staff_space, 180);
 	penpos4(stafflinethickness, -90);
-	penpos5(hair, -5);
+	penpos5(hair, -13);
+	penpos6(hair, 10);
 	
-	draw_bulb(-1, z1l,  z1r, bulb_rad, .8);
+	draw_bulb(-1, z6l,  z6r, bulb_rad, .8);
 
-	fill z1l{up} .. z2l{left} .. z3l{down} .. z4l{right} ..
-	simple_serif(z5l, z5r, -90) .. 
-	z4r{left} .. z3r{up} .. z2r{right} .. z1r -- cycle;
+	save s ;
+	s := 0.735;
+	fill z1l{dir (100)}
+		.. z2l{left}
+			.. tension 0.8
+		.. z3l{down} .. tension 0.8 .. z4l{right} ..
+		simple_serif(z5l, z5r, -90) .. 
+		z4r{left}
+			.. super_curvelet (z4r,z3r,s,-1)
+			..  z3r{up}
+			.. super_curvelet (z3r,z2r,s, 1)
+			.. z2r{right} .. {dir (-80)}z1r -- cycle;
 	
-%	labels(1,2,3,4,5);
-	penlabels(1,2,3,4,5);
+	set_char_box(0, width#, staff_space#, staff_space#);
+
+	penlabels(1,2,3,4,5,6);
 enddef;
 
-fet_beginchar ("4/4 meter", "C", "fourfourmeter")
-	set_char_box(.8 interline#, .7 interline#, interline#, interline#);
-	
+fet_beginchar ("4/4 meter", "C4/4", "fourfourmeter")
 	draw_C;
 fet_endchar;
 
-fet_beginchar ("4/4 meter", "C2", "allabreve")
-	set_char_box(.8 interline#, .7 interline#, 1.4 interline#, 1.4 interline#);
-	
+fet_beginchar ("2/2 meter", "C2/2", "allabreve")
 	draw_C;
-	draw_block((-stafflinethickness, -d), (0, h));
-fet_endchar;
+	save excentricity;
+	pair excentricity;
+
+	xpart excentricity = x2 -1.25 stafflinethickness;
+	ypart excentricity = 0;
 
+	save stemlen ;
+	stemlen = 1.4 staff_space;
+	save thick;
+	thick = stafflinethickness / 2 + 0.025 staff_space;
 
+	draw_block((- thick, - stemlen) + excentricity, (thick , stemlen) + excentricity);
+fet_endchar;
 
 fet_endgroup("timesig");