X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Fparmesan-heads.mf;h=b897554d883a7f53b96aa2f281674e7e9e20429a;hb=13ca4123d326ade652522703a5d15186971318e2;hp=db54fd54f28308530de29c8e8b20adb6612a9c60;hpb=dc3709e0198610f8c0723e74202ac4792230b682;p=lilypond.git

diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf
index db54fd54f2..b897554d88 100644
--- a/mf/parmesan-heads.mf
+++ b/mf/parmesan-heads.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2001--2006 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2009 Juergen Reuter <reuter@ipd.uka.de>
 % 
 % Neo-mensural heads originally by
 % Christian Mondrup and Mats Bengtsson
@@ -182,17 +182,17 @@ enddef;
 %
 % (ze is wel breed)
 % 
-fet_beginchar ("Neo-mensural maxima notehead", "s-3neomensural");
+fet_beginchar ("Neo-mensural maxima notehead", "sM3neomensural");
 	draw_neomensural_longa (2.6 staff_space#);
 fet_endchar;
 
 
-fet_beginchar ("Neo-mensural longa notehead", "s-2neomensural");
+fet_beginchar ("Neo-mensural longa notehead", "sM2neomensural");
 	draw_neomensural_longa (2 staff_space#);
 fet_endchar;
 
 
-fet_beginchar ("Neo-mensural brevis notehead", "s-1neomensural");
+fet_beginchar ("Neo-mensural brevis notehead", "sM1neomensural");
 	draw_neomensural_brevis (2 staff_space#);
 fet_endchar;
 
@@ -364,17 +364,17 @@ fet_beginchar ("Mensural left stemmed notehead", "slmensural");
 fet_endchar;
 
 
-fet_beginchar ("Mensural maxima notehead", "s-3mensural");
+fet_beginchar ("Mensural maxima notehead", "sM3mensural");
 	draw_mensural_longa (2.0 staff_space#);
 fet_endchar;
 
 
-fet_beginchar ("Mensural longa notehead", "s-2mensural");
+fet_beginchar ("Mensural longa notehead", "sM2mensural");
 	draw_mensural_longa (staff_space#);
 fet_endchar;
 
 
-fet_beginchar ("Mensural brevis notehead", "s-1mensural");
+fet_beginchar ("Mensural brevis notehead", "sM1mensural");
 	draw_mensural_brevis (staff_space#);
 fet_endchar;
 
@@ -898,13 +898,18 @@ def epiphonus_char (expr verbose_name, internal_name,
 		save stem_bt;
 
 		if left_stem:
-			z11 = (0.00 wd + 0.6 linethickness / 2, yoffs - 1.1 ht);
-			z12 = (0.00 wd + 0.6 linethickness / 2, yoffs);
-			draw_rounded_block ((0, yoffs - 1.1 ht -
-						  linethickness / 2),
-					    (0.6 linethickness, yoffs),
+			pickup pencircle scaled 0.6 linethickness;
+
+			lft x11 = x1 - linethickness / 2;
+			bot y11 = yoffs - 1.1 ht - linethickness / 2;
+			x12 = x11;
+			y12 = y1;
+
+			draw_rounded_block (bot lft z11, top rt z12,
 					    0.6 linethickness);
 			stem_bt# = yoffs# - 1.1 ht#;
+
+			labels (11, 12);
 		else:
 			stem_bt# = 0;
 		fi;
@@ -1337,33 +1342,46 @@ def med_punctum_char (expr verbose_name, internal_name,
 		z1 = (0.00 wd + blot_diameter / 2, 0);
 		z2 = (0.4 wd - blot_diameter / 2, 0);
 
-		fill get_subpath (ellipse, left, right, z1)
-		     -- get_subpath (ellipse, right, left, z2)
-		     -- cycle;
-
 		labels (1, 2);
 
 		pickup pencircle scaled linethickness;
 
 		if left_down_stem:
-			set_char_box (0.0, 0.4 wd#, 1.25 ht#, 0.25 ht#);
+			z4 = (0.00 wd + linethickness / 2, -1.25 ht);
+
+			fill get_subpath (ellipse, left, down, z1)
+			     -- top lft z4{down}
+			     .. z4{right}
+			     .. top rt z4{up}
+			     -- (rt x4, -.5 ht / 2)
+			     -- get_subpath (ellipse, right, left, z2)
+			     -- cycle;
 
-			z4 = (0.00 wd + linethickness / 2, blot_diameter / 2);
-			z5 = (0.00 wd + linethickness / 2, -1.25 ht);
+			labels (4);
 
-			draw_rounded_block (lft z5, rt z4, linethickness);
+			set_char_box (0.0, 0.4 wd#, 1.25 ht#, 0.25 ht#);
 		elseif left_up_stem:
-			set_char_box (0.0, 0.4 wd#, 0.25 ht#, 1.25 ht#);
+			z4 = (0.00 wd + linethickness / 2, +1.25 ht);
+
+			fill get_subpath (ellipse, down, right, z1)
+			     -- get_subpath (ellipse, right, left, z2)
+			     -- (rt x4, .5 ht / 2)
+			     -- bot rt z4{up}
+			     .. z4{left}
+			     .. bot lft z4{down}
+			     -- cycle;
 
-			z4 = (0.00 wd + linethickness / 2, -blot_diameter / 2);
-			z5 = (0.00 wd + linethickness / 2, +1.25 ht);
+			labels (4);
 
-			draw_rounded_block (lft z4, rt z5, linethickness);
+			set_char_box (0.0, 0.4 wd#, 0.25 ht#, 1.25 ht#);
 		else:
+			fill get_subpath (ellipse, left, right, z1)
+			     -- get_subpath (ellipse, right, left, z2)
+			     -- cycle;
+
 			set_char_box (0.0, 0.4 wd#, 0.25 ht#, 0.25 ht#);
 		fi;
 
-		labels (4, 5);
 	fet_endchar;
 enddef;