X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Fparmesan-accidentals.mf;h=e0e04c4ae8eb47e08ca1a03ec4b7574633692fe3;hb=dc688499ee135312d6157e603a26c2407201eee3;hp=71918ea2a3515af41eeb86610a4ba47e988bb515;hpb=2ef0f6a17cfe1fe8b5be70a1c53212c20f6e3f30;p=lilypond.git

diff --git a/mf/parmesan-accidentals.mf b/mf/parmesan-accidentals.mf
index 71918ea2a3..e0e04c4ae8 100644
--- a/mf/parmesan-accidentals.mf
+++ b/mf/parmesan-accidentals.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 2001--2002 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2004 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 fet_begingroup ("accidentals")
@@ -17,12 +17,12 @@ fet_begingroup ("accidentals")
 %
 %
 %
-fet_beginchar("Ed. Med. Flat" , "medicaea-1", "medicaeaflat");
-	set_char_box(0, 0.8 staff_space#, 0.6 staff_space#, 
-	  2.0 staff_space#);
+fet_beginchar("Ed. Med. Flat" , "medicaea-1");
+	set_char_box(0.1 staff_space#, 0.6 staff_space#,
+		     0.6 staff_space#, 1.0 staff_space#);
 
 	pickup pencircle
-		xscaled 0.50 stafflinethickness
+		xscaled 0.50 linethickness
 		yscaled 0.22 staff_space;
 
 	save za, zb;
@@ -33,7 +33,7 @@ fet_beginchar("Ed. Med. Flat" , "medicaea-1", "medicaeaflat");
 	draw za -- zb;
 
 	pickup pencircle
-		xscaled 0.50 stafflinethickness
+		xscaled 0.50 linethickness
 		yscaled 0.22 staff_space
 		rotated -63;
 
@@ -56,11 +56,7 @@ fet_beginchar("Ed. Med. Flat" , "medicaea-1", "medicaeaflat");
 %
 %
 %
-fet_beginchar("Ed. Vat. Flat" , "vaticana-1", "vaticanaflat");
-        set_char_box(0, 0.7 staff_space#, 0.6 staff_space#, 
-                2.0 staff_space#);
-        define_pixels (stafflinethickness, staff_space);
-
+fet_beginchar("Ed. Vat. Flat" , "vaticana-1");
         save za, zb, zc, zd, ze, zf, zg;
         pair za, zb, zc, zd, ze, zf, zg;
         za = (0.00 staff_space, +0.80 staff_space);
@@ -72,20 +68,21 @@ fet_beginchar("Ed. Vat. Flat" , "vaticana-1", "vaticanaflat");
         zg = (0.15 staff_space, +0.26 staff_space);
 
         pickup pencircle
-                xscaled 0.50 stafflinethickness
+                xscaled 0.50 linethickness
                 yscaled 0.22 staff_space;
         draw za{down} .. {down}zb .. zc .. zd{up} .. {up}ze .. zf .. zg;
-        fet_endchar;
 
-fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural");
-	set_char_box(0, 0.6 staff_space#, 0.6 staff_space#, 
-		2.0 staff_space#);
-	define_pixels (stafflinethickness, staff_space);
+        set_char_box(0.00 staff_space# + 0.25 linethickness#,
+		     0.50 staff_space# + 0.25 linethickness#,
+		     0.23 staff_space# + 0.11 staff_space#,
+		     0.80 staff_space# + 0.11 staff_space#);
+        fet_endchar;
 
+fet_beginchar("Ed. Vat. Natural" , "vaticana0");
 	save za, zb, zc, zd;
 	pair za, zb, zc, zd;
 	pickup pencircle
-		xscaled 0.80 stafflinethickness
+		xscaled 0.80 linethickness
 		yscaled 0.22 staff_space;
 	za = (0.00 staff_space, +0.65 staff_space);
 	zb = (0.00 staff_space, -0.35 staff_space);
@@ -99,6 +96,11 @@ fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural");
 		yscaled -1
 		shifted (0.40 staff_space, 0.0 staff_space);
 
+	set_char_box(0.00 staff_space# + 0.40 linethickness#,
+		     0.40 staff_space# + 0.40 linethickness#,
+		     0.65 staff_space# + 0.11 staff_space#,
+		     0.65 staff_space# + 0.11 staff_space#);
+
 	fet_endchar;
 
 %%%%%%%%
@@ -109,12 +111,10 @@ fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural");
 %
 %
 %
-fet_beginchar("Mensural Sharp" , "mensural1", "mensuralsharp");
-	set_char_box(0.4 staff_space#, 0.6 staff_space#, 0.5 staff_space#, 
-		0.5 staff_space#);
+fet_beginchar("Mensural Sharp" , "mensural1");
 	save stemthick;
-	define_pixels (stemthick, staff_space);
-	stemthick# = stafflinethickness#;
+	define_pixels (stemthick);
+	stemthick# = linethickness#;
 
 	save za, zb;
 	pair za, zb;
@@ -126,14 +126,17 @@ fet_beginchar("Mensural Sharp" , "mensural1", "mensuralsharp");
 	addto currentpicture also currentpicture xscaled -1;
 	addto currentpicture also currentpicture shifted (0.20 staff_space, 0);
 
+	set_char_box(0.8 * 0.4 staff_space# + 0.4 stemthick#,
+		     (0.8 * 0.4 + 0.2) * staff_space# + 0.4 stemthick#,
+		     0.4 staff_space# + 0.4 stemthick#, 
+		     0.4 staff_space# + 0.4 stemthick#);
+
 	fet_endchar;
 
-fet_beginchar("Mensural Flat" , "mensural-1", "mensuralflat");
-	set_char_box(0.1 staff_space#, 0.7 staff_space#, 0.4 staff_space#, 
-		1.8 staff_space#);
+fet_beginchar("Mensural Flat" , "mensural-1");
 	save stemthick;
-	define_pixels (stemthick, staff_space);
-	stemthick# = stafflinethickness#;
+	define_pixels (stemthick);
+	stemthick# = linethickness#;
 
 	save za, zb, zc, zd, ze;
 	pair za, zb, zc, zd, ze;
@@ -148,14 +151,18 @@ fet_beginchar("Mensural Flat" , "mensural-1", "mensuralflat");
 	zd = (0.35 staff_space, +0.25 staff_space);
 	ze = (0.00 staff_space, +0.25 staff_space);
 	draw za -- zb .. zc .. zd .. ze;
+
+	set_char_box(0.00 staff_space# + 0.75 stemthick#,
+		     0.40 staff_space# + 0.75 stemthick#,
+		     0.25 staff_space# + 0.75 stemthick#,
+		     1.80 staff_space# + 0.75 stemthick#);
+
 	fet_endchar;
 
-fet_beginchar("Hufnagel Flat" , "hufnagel-1", "hufnagelflat");
-	set_char_box(0.5 staff_space#, 0.7 staff_space#, 0.4 staff_space#, 
-		1.8 staff_space#);
+fet_beginchar("Hufnagel Flat" , "hufnagel-1");
 	save stemthick;
-	define_pixels (stemthick, staff_space);
-	stemthick# = stafflinethickness#;
+	define_pixels (stemthick);
+	stemthick# = linethickness#;
 
 	save za, zb, zc, zd, ze, zf;
 	pair za, zb, zc, zd, ze, zf;
@@ -171,6 +178,12 @@ fet_beginchar("Hufnagel Flat" , "hufnagel-1", "hufnagelflat");
 	ze = (0.30 staff_space, +0.30 staff_space);
 	zf = (0.00 staff_space, +0.15 staff_space);
 	draw za -- zb -- zc .. zd .. ze -- zf;
+
+	set_char_box(0.00 staff_space# + 1.0 stemthick#,
+		     0.50 staff_space# + 1.0 stemthick#,
+		     0.30 staff_space# + 0.5 stemthick#, 
+		     1.80 staff_space# + 0.5 stemthick#);
+
 	fet_endchar;
 
 fet_endgroup ("accidentals")