*** empty log message ***

[lilypond.git] / mf / parmesan-heads.mf

diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf
index 85dc846f95de52ef82ba81b29eec8700654fc490..a61c8e115967b124ad2a63a68c092ad9a2493647 100644 (file)
--- 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--2004 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2005 Juergen Reuter <reuter@ipd.uka.de>
 % 
 % Neo-mensural heads originally by
 % Christian Mondrup and Mats Bengtsson
@@ -83,7 +83,6 @@ def draw_neomensural_brevis(expr brevwid) =
                -- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle;
 
        addto currentpicture also currentpicture yscaled -1;
-       show z4r; show z4l;
        addto currentpicture also currentpicture 
                shifted (-x4r,0) xscaled -1 shifted (x4l,0);
 
@@ -100,7 +99,7 @@ def draw_neomensural_left_stemmed_head (expr wid) =
        draw z6 .. z7;
 enddef;
 
-fet_beginchar("Left stemmed notehead", "lneomensural", "neomensuralleftstemmedhead");
+fet_beginchar("Left stemmed notehead", "lneomensural");
        draw_neomensural_left_stemmed_head (2 staff_space#);
 fet_endchar;
 
@@ -129,15 +128,15 @@ enddef;
 %
 % (ze is wel breed)
 % 
-fet_beginchar("Neo-mensural maxima notehead", "-3neomensural", "neomensuralmaximahead");
+fet_beginchar("Neo-mensural maxima notehead", "s-3neomensural");
        draw_neomensural_longa (2.6 staff_space#)
 fet_endchar;
 
-fet_beginchar("Neo-mensural longa notehead", "-2neomensural", "neomensurallongahead");
+fet_beginchar("Neo-mensural longa notehead", "s-2neomensural");
        draw_neomensural_longa (2 staff_space#)
 fet_endchar;
 
-fet_beginchar("Neo-mensural brevis notehead", "-1neomensural", "neomensuralbrevishead")
+fet_beginchar("Neo-mensural brevis notehead", "s-1neomensural")
        draw_neomensural_brevis(2 staff_space#);
 fet_endchar;
 
@@ -181,7 +180,7 @@ def draw_neomensural_open_head (expr wid, height)=
        unfill z5 -- z6 -- z7 -- z8 --cycle;
 enddef;
 
-fet_beginchar("Neo-mensural open head","0neomensural","neomensuralsemibrevishead")
+fet_beginchar("Neo-mensural open head","s0neomensural")
       draw_neomensural_open_head (staff_space#, noteheight#);
 fet_endchar;
 
@@ -190,7 +189,7 @@ fet_endchar;
 %
 
 fet_beginchar("Harmonic notehead (Neo-mensural open)",
-               "0harmonic","harmonichead")
+               "0harmonic")
 
        draw_neomensural_open_head (1.3 staff_space#, 1.3 noteheight#);
        charwx := head_width#;
@@ -198,11 +197,11 @@ fet_beginchar("Harmonic notehead (Neo-mensural open)",
 fet_endchar;
 
 
-fet_beginchar("Neo-mensural open head","1neomensural","neomensuralminimahead")
+fet_beginchar("Neo-mensural open head","s1neomensural")
       draw_neomensural_open_head (staff_space#, noteheight#);
 fet_endchar;
 
-fet_beginchar("Neo-mensural black head","2neomensural","neomensuralsemiminimahead")
+fet_beginchar("Neo-mensural black head","s2neomensural")
       draw_neomensural_black_head (staff_space#, noteheight#);
 fet_endchar;
 
@@ -231,19 +230,19 @@ def draw_mensural_longa (expr wid) =
        draw z6 .. z7;
 enddef;
 
-fet_beginchar("Mensural left stemmed notehead", "lmensural", "mensuralleftstemmedhead");
+fet_beginchar("Mensural left stemmed notehead", "slmensural");
        draw_mensural_left_stemmed_head (staff_space#)
 fet_endchar;
 
-fet_beginchar("Mensural maxima notehead", "-3mensural", "mensuralmaximahead");
+fet_beginchar("Mensural maxima notehead", "s-3mensural");
        draw_mensural_longa (2.0 staff_space#)
 fet_endchar;
 
-fet_beginchar("Mensural longa notehead", "-2mensural", "mensurallongahead");
+fet_beginchar("Mensural longa notehead", "s-2mensural");
        draw_mensural_longa (staff_space#)
 fet_endchar;
 
-fet_beginchar("Mensural brevis notehead", "-1mensural", "mensuralbrevishead")
+fet_beginchar("Mensural brevis notehead", "s-1mensural")
        draw_mensural_brevis(staff_space#);
 fet_endchar;
 
@@ -288,15 +287,15 @@ def draw_diamond_head (expr head_h, pen_w, pen_h, angle, open) =
 enddef;
 
 
-fet_beginchar("Mensural open head","0mensural","mensuralsemibrevishead")
+fet_beginchar("Mensural open head","s0mensural")
        draw_diamond_head (staff_space#, 0.15, 0.30, 30, true);
 fet_endchar;
 
-fet_beginchar("Mensural open head","1mensural","mensuralminimahead")
+fet_beginchar("Mensural open head","s1mensural")
        draw_diamond_head (staff_space#, 0.15, 0.30, 30, true);
 fet_endchar;
 
-fet_beginchar("Mensural black head","2mensural","mensuralsemiminimahead")
+fet_beginchar("Mensural black head","s2mensural")
        draw_diamond_head (staff_space#, 0.15, 0.30, 30, false);
 fet_endchar;
 
@@ -311,11 +310,11 @@ fet_endchar;
 %
 
 % parameterized punctum
-def punctum_char (expr verbose_name, internal_name, ly_name,
+def punctum_char (expr verbose_name, internal_name,
                  left_stem, right_stem, linea, cavum,
                  straight, auctum, direction_up, excentric, up_shift, down_shift, mag) =
 
-       fet_beginchar(verbose_name, internal_name, ly_name)
+       fet_beginchar(verbose_name, "s" & internal_name)
                save b_h, a_w;
                a_b := 1.54; % b_h*a_b/a_w = wd/ht
                b_h := 0.85;
@@ -469,10 +468,10 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
 enddef;
 
 % parameterized punctum inclinatum
-def inclinatum_char(expr verbose_name, internal_name, ly_name,
+def inclinatum_char(expr verbose_name, internal_name,
                    small, stropha, auctum) =
 
-       fet_beginchar(verbose_name, internal_name, ly_name)
+       fet_beginchar(verbose_name, "s"&internal_name)
                save ht, alpha;
                alpha# = 35;
                if small:
@@ -510,45 +509,41 @@ def inclinatum_char(expr verbose_name, internal_name, ly_name,
 enddef;
 
 % punctum
-punctum_char("Ed. Vat. punctum", "vaticana-punctum", "vatpunctumhead",
+punctum_char("Ed. Vat. punctum", "vaticana.punctum",
             false, false, false, false, false,
             false, false, false, false, false, 1.0);
 
 % punctum cavum (for OpusTeX compatibility)
-punctum_char("Ed. Vat. punctum cavum", "vaticana-punctum-cavum",
-            "vatpunctumcavumhead",
+punctum_char("Ed. Vat. punctum cavum", "vaticana.punctum.cavum",
             false, false, false, true, false,
             false, false, false, false, false, 1.0);
 
 % linea punctum (for OpusTeX compatibility)
-punctum_char("Ed. Vat. linea punctum", "vaticana-linea-punctum",
-            "vatlineapunctumhead",
+punctum_char("Ed. Vat. linea punctum", "vaticana.linea.punctum",
             false, false, true, false, false,
             false, false, false, false, false, 1.0);
 
 % linea punctum cavum (for OpusTeX compatibility)
-punctum_char("Ed. Vat. linea punctum cavum", "vaticana-linea-punctum-cavum",
-            "vatlineapunctumcavumhead",
+punctum_char("Ed. Vat. linea punctum cavum", "vaticana.linea.punctum.cavum",
             false, false, true, true, false,
             false, false, false, false, false, 1.0);
 
 % punctum inclinatum
-inclinatum_char("Ed. Vat. inclinatum", "vaticana-inclinatum",
-               "vatinclinatumhead",
+inclinatum_char("Ed. Vat. inclinatum", "vaticana.inclinatum",
                false, false, false);
 
 % pes lower punctum
-punctum_char("Ed. Vat. pes lower punctum", "vaticana-lpes", "vatlpeshead",
+punctum_char("Ed. Vat. pes lower punctum", "vaticana.lpes",
             false, false, false, false, true,
             false, true, false, false, false, 1.0);
 
 % pes lower punctum
-punctum_char("Ed. Vat. pes var lower punctum", "vaticana-vlpes", "vatvlpeshead",
+punctum_char("Ed. Vat. pes var lower punctum", "vaticana.vlpes",
             false, false, false, false, true,
             false, true, false, false, true, 1.0);
 
 % pes upper punctum
-punctum_char("Ed. Vat. pes upper punctum", "vaticana-upes", "vatupeshead",
+punctum_char("Ed. Vat. pes upper punctum", "vaticana.upes", 
             false, false, false, false, true,
             false, false, false, false, false, 1.0);
 
@@ -558,18 +553,17 @@ punctum_char("Ed. Vat. pes upper punctum", "vaticana-upes", "vatupeshead",
 % avoid collision with the lower punctum note of the pes when the upper
 % punctum sits directly on top of the lower punctum.
 %
-punctum_char("Ed. Vat. var pes upper punctum", "vaticana-vupes",
-            "vatvupeshead",
+punctum_char("Ed. Vat. var pes upper punctum", "vaticana.vupes",
             false, false, false, false, true,
             false, false, false, true, false, 1.0);
 
 % small punctum as used in epiphonus
-punctum_char("Ed. Vat. plica", "vaticana-plica", "vatplicahead",
+punctum_char("Ed. Vat. plica", "vaticana.plica", 
             false, false, false, false, false,
             false, false, false, false, false, 0.6);
 
 % excentric punctum as used in epiphonus
-punctum_char("Ed. Vat. epiphonus", "vaticana-epiphonus", "vatepiphonushead",
+punctum_char("Ed. Vat. epiphonus", "vaticana.epiphonus", 
             false, false, false, false, false,
             false, true, true, false, false, 1.0);
 
@@ -579,29 +573,27 @@ punctum_char("Ed. Vat. epiphonus", "vaticana-epiphonus", "vatepiphonushead",
 % avoid collision with the plica head when the plica sits directly on
 % top of the lower head.
 %
-punctum_char("Ed. Vat. var epiphonus", "vaticana-vepiphonus", "vatvepiphonushead",
+punctum_char("Ed. Vat. var epiphonus", "vaticana.vepiphonus",
             false, false, false, false, false,
             false, true, true, false, true, 1.0);
 
 % small punctum as used in cephalicus
-punctum_char("Ed. Vat. rev. plica", "vaticana-reverse-plica", "vatrplicahead",
+punctum_char("Ed. Vat. rev. plica", "vaticana.reverse.plica",
             false, false, false, false, false,
             false, true, false, false, false, 0.6);
 
 % excentric punctum as used in cephalicus; without left stem
-punctum_char("Ed. Vat. cephalicus", "vaticana-inner-cephalicus",
-            "vatinnercephalicushead",
+punctum_char("Ed. Vat. cephalicus", "vaticana.inner.cephalicus",
             false, false, false, false, false,
             false, false, true, false, false, 1.0);
 
 % excentric punctum as used in cephalicus; with left stem
-punctum_char("Ed. Vat. cephalicus", "vaticana-cephalicus",
-            "vatcephalicushead",
+punctum_char("Ed. Vat. cephalicus", "vaticana.cephalicus",
             true, false, false, false, false,
             false, false, true, false, false, 1.0);
 
 % quilisma
-fet_beginchar("Ed. Vat. quilisma", "vaticana-quilisma", "vatquilismahead")
+fet_beginchar("Ed. Vat. quilisma", "svaticana.quilisma")
        save b_h,a_w;
        a_b:=1.54; % b_h*a_b/a_w = wd/ht
        b_h:=0.85;
@@ -628,40 +620,33 @@ fet_beginchar("Ed. Vat. quilisma", "vaticana-quilisma", "vatquilismahead")
 fet_endchar;
 
 % solesmes punctum inclinatum parvum
-inclinatum_char("Solesmes punctum inclinatum parvum", "solesmes-incl-parvum",
-               "solinclparvumhead",
+inclinatum_char("Solesmes punctum inclinatum parvum", "solesmes.incl.parvum",
                true, false, false);
 
 % solesmes punctum auctum ascendens
-punctum_char("Solesmes punctum auctum ascendens", "solesmes-auct-asc",
-            "solauctaschead",
+punctum_char("Solesmes punctum auctum ascendens", "solesmes.auct.asc",
             false, false, false, false, false,
             true, true, false, false, false, 1.0);
 
 % solesmes punctum auctum descendens
-punctum_char("Solesmes punctum auctum descendens", "solesmes-auct-desc",
-            "solauctdeschead",
+punctum_char("Solesmes punctum auctum descendens", "solesmes.auct.desc",
             false, false, false, false, false,
             true, false, false, false, false, 1.0);
 
 % solesmes punctum inclinatum auctum
-inclinatum_char("Solesmes punctum incl. auctum", "solesmes-incl-auctum",
-               "solpunctuminclinatumauctumhead",
+inclinatum_char("Solesmes punctum incl. auctum", "solesmes.incl.auctum",
                false, false, true);
 
 % solesmes stropha
-inclinatum_char("Solesmes stropha", "solesmes-stropha",
-               "solstrophahead",
+inclinatum_char("Solesmes stropha", "solesmes.stropha",
                false, true, false);
 
 % solesmes stropha aucta
-inclinatum_char("Solesmes stropha aucta", "solesmes-stropha-aucta",
-               "solstrophaauctahead",
+inclinatum_char("Solesmes stropha aucta", "solesmes.stropha.aucta",
                false, true, true);
 
 % solesmes oriscus
-fet_beginchar("Solesmes oriscus", "solesmes-oriscus",
-       "soloriscushead")
+fet_beginchar("Solesmes oriscus", "ssolesmes.oriscus")
        save b_h, a_w;
        a_b := 1.54; % b_h*a_b/a_w = wd/ht
        b_h := 0.85;
@@ -698,16 +683,15 @@ fet_endchar;
 %
 
 % inclinatum
-fet_beginchar("Ed. Med. inclinatum", "medicaea-inclinatum",
-       "medinclinatumhead")
+fet_beginchar("Ed. Med. inclinatum", "smedicaea.inclinatum")
        draw_diamond_head (1.2staff_space#, 0, 0, 35, false);
 fet_endchar;
 
 % parametrized punctum
-def punctum_char (expr verbose_name, internal_name, ly_name,
+def punctum_char (expr verbose_name, internal_name,
        left_up_stem, left_down_stem) =
 
-       fet_beginchar(verbose_name, internal_name, ly_name)
+       fet_beginchar(verbose_name, "s"&internal_name)
 
                save a, beta, ht, wd;
                ht# = 2 staff_space#;
@@ -744,15 +728,15 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
 enddef;
 
 % punctum
-punctum_char("Ed. Med. punctum", "medicaea-punctum", "medpunctumhead",
+punctum_char("Ed. Med. punctum", "medicaea.punctum", 
        false, false);
 
 % left up-stemmed punctum
-punctum_char("Ed. Med. reverse virga", "medicaea-rvirga", "medrvirgahead",
+punctum_char("Ed. Med. reverse virga", "medicaea.rvirga",
        true, false);
 
 % virga (i.e. left down-stemmed punctum)
-punctum_char("Ed. Med. virga", "medicaea-virga", "medvirgahead",
+punctum_char("Ed. Med. virga", "medicaea.virga", 
        false, true);
 
 %%%%%%%%
@@ -766,9 +750,9 @@ punctum_char("Ed. Med. virga", "medicaea-virga", "medvirgahead",
 
 % punctum
 % parametrized punctum
-def punctum_char (expr verbose_name, internal_name, ly_name,
+def punctum_char (expr verbose_name, internal_name,
        down_stem) =
-       fet_beginchar(verbose_name, internal_name, ly_name)
+       fet_beginchar(verbose_name, "s" & internal_name)
                save alpha;
                alpha# = 55;
                draw_diamond_head (staff_space#, 0, 0, alpha#, false);
@@ -788,13 +772,13 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
 enddef;
 
 % punctum
-punctum_char("Hufnagel punctum", "hufnagel-punctum", "hufpunctumhead", false)
+punctum_char("Hufnagel punctum", "hufnagel.punctum", false)
 
 % virga
-punctum_char("Hufnagel virga", "hufnagel-virga", "hufvirgahead", true)
+punctum_char("Hufnagel virga", "hufnagel.virga",  true)
 
 % pes lower punctum
-fet_beginchar("Hufnagel pes lower punctum", "hufnagel-lpes", "huflpeshead")
+fet_beginchar("Hufnagel pes lower punctum", "shufnagel.lpes")
        save width, height, alpha;
        width# = 2*staff_space#;
        height# = 0.7*staff_space#;