X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Fparmesan-clefs.mf;h=64a2067d4680aa4a090a08cfc7936f4de598b661;hb=eb97ff53e2ab83edbde770b61bcbb876268f82ad;hp=4f6371149183b94d9318b7f9c92ed9dd216e378d;hpb=b342db300b355af0cc99934b89a6764ca25dd1e2;p=lilypond.git

diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf
index 4f63711491..64a2067d46 100644
--- a/mf/parmesan-clefs.mf
+++ b/mf/parmesan-clefs.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 %
-% (c) 2001--2004 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2005 Juergen Reuter <reuter@ipd.uka.de>
 %
 
 fet_begingroup ("clefs")
@@ -81,13 +81,13 @@ def draw_vaticana_do_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Ed. Vat. do clef", "vaticana_do", "vatdoclef")
+fet_beginchar("Ed. Vat. do clef", "vaticana.do")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_vaticana_do_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Ed. Vat. do clef", "vaticana_do_change", "vatcdoclef")
+fet_beginchar("Ed. Vat. do clef", "vaticana.do_change")
 	draw_vaticana_do_clef((0,0), 1.0); % no reduction
 fet_endchar;
 
@@ -129,13 +129,13 @@ def draw_vaticana_fa_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Ed. Vat. fa clef", "vaticana_fa", "vatfaclef")
+fet_beginchar("Ed. Vat. fa clef", "vaticana.fa")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_vaticana_fa_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Ed. Vat. fa clef", "vaticana_fa_change", "vatcfaclef")
+fet_beginchar("Ed. Vat. fa clef", "vaticana.fa_change")
 	draw_vaticana_fa_clef((0,0), 1.0); % no reduction
 fet_endchar;
 
@@ -196,13 +196,13 @@ def draw_medicaea_do_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Ed. Med. do clef", "medicaea_do", "meddoclef")
+fet_beginchar("Ed. Med. do clef", "medicaea.do")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_medicaea_do_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Ed. Med. do clef", "medicaea_do_change", "cmeddoclef")
+fet_beginchar("Ed. Med. do clef", "medicaea.do_change")
 	draw_medicaea_do_clef((0,0), .8);
 fet_endchar;
 
@@ -247,13 +247,13 @@ def draw_medicaea_fa_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Ed. Med. fa clef", "medicaea_fa", "medfaclef")
+fet_beginchar("Ed. Med. fa clef", "medicaea.fa")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_medicaea_fa_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Ed. Med. fa clef", "medicaea_fa_change", "cmedfaclef")
+fet_beginchar("Ed. Med. fa clef", "medicaea.fa_change")
 	draw_medicaea_fa_clef((0,0), .8);
 fet_endchar;
 
@@ -322,7 +322,7 @@ def draw_brevis(expr exact_center, bwidth, bheight, blinethickness) =
 enddef;
 
 
-def draw_neo_mensural_c_clef(expr exact_center, reduction) = 
+def draw_neomensural_c_clef(expr exact_center, reduction) = 
 	save reduced_il, reduced_slt, stem_width;
 	reduced_il# = staff_space# * reduction;
 	reduced_slt# = linethickness# * reduction;
@@ -357,14 +357,14 @@ def draw_neo_mensural_c_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("neo-mensural c clef", "neomensural_c", "neomenscclef")
+fet_beginchar("neo-mensural c clef", "neomensural.c")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
-	draw_neo_mensural_c_clef((0,0), 1.0);
+	draw_neomensural_c_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("neo-mensural c clef", "neomensural_c_change", "cneomenscclef")
-	draw_neo_mensural_c_clef((0,0), .8);
+fet_beginchar("neo-mensural c clef", "neomensural.c_change")
+	draw_neomensural_c_clef((0,0), .8);
 fet_endchar;
 
 
@@ -415,53 +415,53 @@ def draw_petrucci_c_clef(expr exact_center, flare_align, reduction) =
 enddef;
 
 
-fet_beginchar("petrucci c1 clef", "petrucci_c1", "petruccic1clef")
+fet_beginchar("petrucci c1 clef", "petrucci.c1")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_c_clef((0,0), +2, 1.0);
 fet_endchar;
-fet_beginchar("petrucci c1 clef", "petrucci_c1_change", "cpetruccic1clef")
+fet_beginchar("petrucci c1 clef", "petrucci.c1_change")
 	draw_petrucci_c_clef((0,0), +2, .8);
 fet_endchar;
 
-fet_beginchar("petrucci c2 clef", "petrucci_c2", "petruccic2clef")
+fet_beginchar("petrucci c2 clef", "petrucci.c2")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_c_clef((0,0), +1, 1.0);
 fet_endchar;
-fet_beginchar("petrucci c2 clef", "petrucci_c2_change", "cpetruccic2clef")
+fet_beginchar("petrucci c2 clef", "petrucci.c2_change")
 	draw_petrucci_c_clef((0,0), +1, .8);
 fet_endchar;
 
-fet_beginchar("petrucci c3 clef", "petrucci_c3", "petruccic3clef")
+fet_beginchar("petrucci c3 clef", "petrucci.c3")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_c_clef((0,0), 0, 1.0);
 fet_endchar;
-fet_beginchar("petrucci c3 clef", "petrucci_c3_change", "cpetruccic3clef")
+fet_beginchar("petrucci c3 clef", "petrucci.c3_change")
 	draw_petrucci_c_clef((0,0), 0, .8);
 fet_endchar;
 
-fet_beginchar("petrucci c4 clef", "petrucci_c4", "petruccic4clef")
+fet_beginchar("petrucci c4 clef", "petrucci.c4")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_c_clef((0,0), -1, 1.0);
 fet_endchar;
-fet_beginchar("petrucci c4 clef", "petrucci_c4_change", "cpetruccic4clef")
+fet_beginchar("petrucci c4 clef", "petrucci.c4_change")
 	draw_petrucci_c_clef((0,0), -1, .8);
 fet_endchar;
 
-fet_beginchar("petrucci c5 clef", "petrucci_c5", "petruccic5clef")
+fet_beginchar("petrucci c5 clef", "petrucci.c5")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_c_clef((0,0), -2, 1.0);
 fet_endchar;
-fet_beginchar("petrucci c5 clef", "petrucci_c5_change", "cpetruc5iceclef")
+fet_beginchar("petrucci c5 clef", "petrucci.c5_change")
 	draw_petrucci_c_clef((0,0), -2, .8);
 fet_endchar;
 
@@ -505,13 +505,13 @@ def draw_mensural_c_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("mensural c clef", "mensural_c", "menscclef")
+fet_beginchar("mensural c clef", "mensural.c")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_mensural_c_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("mensural c clef", "mensural_c_change", "cmenscclef")
+fet_beginchar("mensural c clef", "mensural.c_change")
 	draw_mensural_c_clef((0,0), .8);
 fet_endchar;
 
@@ -615,13 +615,13 @@ def draw_petrucci_f_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("petrucci f clef", "petrucci_f", "petruccifclef")
+fet_beginchar("petrucci f clef", "petrucci.f")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_f_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("petrucci f clef", "petrucci_f_change", "cpetruccifclef")
+fet_beginchar("petrucci f clef", "petrucci.f_change")
 	draw_petrucci_f_clef((0,0), .8);
 fet_endchar;
 
@@ -675,13 +675,13 @@ def draw_mensural_f_clef(expr exact_center, reduction) =
 		     0.5width# + ypart exact_center);
 enddef;
 
-fet_beginchar("mensural f clef", "mensural_f", "mensfclef")
+fet_beginchar("mensural f clef", "mensural.f")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_mensural_f_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("mensural f clef", "mensural_f_change", "cmensfclef")
+fet_beginchar("mensural f clef", "mensural.f_change")
 	draw_mensural_f_clef((0,0), .8);
 fet_endchar;
 
@@ -746,13 +746,13 @@ def draw_petrucci_g_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("petrucci g clef", "petrucci_g", "petruccigclef")
+fet_beginchar("petrucci g clef", "petrucci.g")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_g_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("petrucci g clef", "petrucci_g_change", "cpetruccigclef")
+fet_beginchar("petrucci g clef", "petrucci.g_change")
 	draw_petrucci_g_clef((0,0), .8);
 fet_endchar;
 
@@ -777,13 +777,13 @@ enddef;
 % FIXME: This clef is preliminarily mapped to the petrucci g clef
 % until the code for the mensural g clef will be rewritten.
 %
-fet_beginchar("mensural g clef", "mensural_g", "mensgclef")
+fet_beginchar("mensural g clef", "mensural.g")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_g_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("mensural g clef", "mensural_g_change", "cmensgclef")
+fet_beginchar("mensural g clef", "mensural.g_change")
 	draw_petrucci_g_clef((0,0), .8);
 fet_endchar;
 
@@ -835,13 +835,13 @@ def draw_hufnagel_do_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Hufnagel do clef", "hufnagel_do", "hufnageldoclef")
+fet_beginchar("Hufnagel do clef", "hufnagel.do")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_hufnagel_do_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Hufnagel do clef", "hufnagel_do_change", "chufnageldoclef")
+fet_beginchar("Hufnagel do clef", "hufnagel.do_change")
 	draw_hufnagel_do_clef((0,0), .8);
 fet_endchar;
 
@@ -892,13 +892,13 @@ def draw_hufnagel_fa_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Hufnagel fa clef", "hufnagel_fa", "hufnagelfaclef")
+fet_beginchar("Hufnagel fa clef", "hufnagel.fa")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_hufnagel_fa_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Hufnagel fa clef", "hufnagel_fa_change", "chufnagelfaclef")
+fet_beginchar("Hufnagel fa clef", "hufnagel.fa_change")
 	draw_hufnagel_fa_clef((0,0), .8);
 fet_endchar;
 
@@ -913,14 +913,13 @@ def draw_hufnagel_do_fa_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa", "hufnageldofaclef")
+fet_beginchar("Hufnagel do/fa clef", "hufnagel.do.fa")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_hufnagel_do_fa_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa_change",
-	      "chufnageldofaclef")
+fet_beginchar("Hufnagel do/fa clef", "hufnagel.do.fa_change")
 	draw_hufnagel_do_fa_clef((0,0), .8);
 fet_endchar;