X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Fparmesan-custodes.mf;h=b4a0be94a056d2e4592a4c23e5a4621c8ad6fbc5;hb=3c6b689307064879dee14768cc4487584345199b;hp=4b167fee0c3711ed5faf7a002e9a529defc75632;hpb=5ca271301d3af557f4720223736dc2d7b981c12b;p=lilypond.git diff --git a/mf/parmesan-custodes.mf b/mf/parmesan-custodes.mf index 4b167fee0c..b4a0be94a0 100644 --- a/mf/parmesan-custodes.mf +++ b/mf/parmesan-custodes.mf @@ -3,7 +3,7 @@ % % source file of LilyPond's pretty-but-neat music font % -% (c) 2000--2002 Juergen Reuter +% (c) 2000--2003 Juergen Reuter % save black_notehead_width; @@ -32,10 +32,10 @@ dir_down = -1; % % parameterized hufnagel custos -def custos_hufnagel(expr verbose_name, internal_name, mudela_name, +def custos_hufnagel(expr verbose_name, internal_name, ly_name, direction, staffline_adjustment) = - fet_beginchar(verbose_name, internal_name, mudela_name) + fet_beginchar(verbose_name, internal_name, ly_name) save b_h, a_w; a_b := 1.54; % b_h * a_b / a_w = wd / ht @@ -47,7 +47,6 @@ def custos_hufnagel(expr verbose_name, internal_name, mudela_name, 2beta# = ht# * b_h; a# = beta# * a_b; wd# = 2a# / a_w; - set_char_box(0, wd#, ht# / 2, ht# / 2); black_notehead_width# := wd#; save rh_width, rh_height, rh_edge; % rhombus dimensions @@ -69,36 +68,39 @@ def custos_hufnagel(expr verbose_name, internal_name, mudela_name, xscaled stafflinethickness yscaled rh_edge rotated (-35*direction); - z1=(0.5rh_width,+0.25direction*rh_height); - z2=(1.0rh_width,-0.25direction*rh_height); + z1=(0.0rh_width,+0.25direction*rh_height); + z2=(0.5rh_width,-0.25direction*rh_height); z3-z2=(stem_size*rh_width,+0.75*stem_size*direction*rh_height); draw z1 -- z2 -- z3; + set_char_box(stafflinethickness#, wd# / 2, + ht# / 2, ht# / 2); + fet_endchar; enddef; % custos hufnagel, stem up, between staff lines -custos_hufnagel("Custos Hufnagel", "hufnagel-u0", "hufnagel_u0", +custos_hufnagel("Custos Hufnagel", "hufnagel-u0", "hufnagelu0", dir_up, between_staff_lines); % custos hufnagel, stem up, on staff line -custos_hufnagel("Custos Hufnagel", "hufnagel-u1", "hufnagel_u1", +custos_hufnagel("Custos Hufnagel", "hufnagel-u1", "hufnagelu1", dir_up, on_staff_line); % custos hufnagel, stem up, anywhere -custos_hufnagel("Custos Hufnagel", "hufnagel-u2", "hufnagel_u2", +custos_hufnagel("Custos Hufnagel", "hufnagel-u2", "hufnagelu2", dir_up, anywhere); % custos hufnagel, stem down, between staff lines -custos_hufnagel("Reverse Custos Hufnagel", "hufnagel-d0", "hufnagel_d0", +custos_hufnagel("Reverse Custos Hufnagel", "hufnagel-d0", "hufnageld0", dir_down, between_staff_lines); % custos hufnagel, stem down, on staff line -custos_hufnagel("Reverse Custos Hufnagel", "hufnagel-d1", "hufnagel_d1", +custos_hufnagel("Reverse Custos Hufnagel", "hufnagel-d1", "hufnageld1", dir_down, on_staff_line); % custos hufnagel, stem down, anywhere -custos_hufnagel("Reverse Custos Hufnagel", "hufnagel-d2", "hufnagel_d2", +custos_hufnagel("Reverse Custos Hufnagel", "hufnagel-d2", "hufnageld2", dir_down, anywhere); %%%%%%%% @@ -108,10 +110,10 @@ custos_hufnagel("Reverse Custos Hufnagel", "hufnagel-d2", "hufnagel_d2", % % -def custos_medicaea(expr verbose_name, internal_name, mudela_name, +def custos_medicaea(expr verbose_name, internal_name, ly_name, direction, staffline_adjustment) = - fet_beginchar(verbose_name, internal_name, mudela_name) + fet_beginchar(verbose_name, internal_name, ly_name) save b_h, a_w; a_b := 1.54; % b_h * a_b / a_w = wd / ht @@ -123,7 +125,6 @@ def custos_medicaea(expr verbose_name, internal_name, mudela_name, 2beta# = ht# * b_h; a# = beta# * a_b; wd# = 0.4a# / a_w; % width intentionally too small - set_char_box(0, wd#, ht# / 2, ht# / 2); black_notehead_width# := wd#; define_pixels(ht, wd); @@ -147,6 +148,8 @@ def custos_medicaea(expr verbose_name, internal_name, mudela_name, z4 = z3 + (0, +direction*stem_size*ht); draw z3 .. z4; + set_char_box(0, wd#, ht# / 2, ht# / 2); + fet_endchar; enddef; @@ -163,15 +166,15 @@ custos_medicaea("Custos Med.", "medicaea-u2", "medicaea_u2", dir_up, anywhere); % custos medicaea, stem down, between staff lines -custos_medicaea("Reverse Custos Med.", "medicaea-d0", "medicaea_d0", +custos_medicaea("Reverse Custos Med.", "medicaea-d0", "medicaead0", dir_down, between_staff_lines); % custos medicaea, stem down, on staff line -custos_medicaea("Reverse Custos Med.", "medicaea-d1", "medicaea_d1", +custos_medicaea("Reverse Custos Med.", "medicaea-d1", "medicaead1", dir_down, on_staff_line); % custos medicaea, stem down, anywhere -custos_medicaea("Reverse Custos Med.", "medicaea-d2", "medicaea_d2", +custos_medicaea("Reverse Custos Med.", "medicaea-d2", "medicaead2", dir_down, anywhere); %%%%%%%% @@ -181,10 +184,10 @@ custos_medicaea("Reverse Custos Med.", "medicaea-d2", "medicaea_d2", % % -def custos_vaticana(expr verbose_name, internal_name, mudela_name, +def custos_vaticana(expr verbose_name, internal_name, ly_name, direction, staffline_adjustment) = - fet_beginchar(verbose_name, internal_name, mudela_name) + fet_beginchar(verbose_name, internal_name, ly_name) save b_h, a_w; a_b := 1.54; % b_h * a_b / a_w = wd / ht @@ -196,7 +199,6 @@ def custos_vaticana(expr verbose_name, internal_name, mudela_name, 2beta# = ht# * b_h; a# = beta# * a_b; wd# = 0.4a# / a_w; - set_char_box(0, wd#, ht# / 2, ht# / 2); black_notehead_width# := wd#; save stem_size; @@ -221,6 +223,8 @@ def custos_vaticana(expr verbose_name, internal_name, mudela_name, z4=(1.0wd, +direction*stem_size*ht); draw z3 -- z4; + set_char_box(0, wd#, 0.3 ht#, 0.3 ht#); + fet_endchar; enddef; @@ -237,15 +241,15 @@ custos_vaticana("Custos Ed. Vat.", "vaticana-u2", "vaticana_u2", dir_up, anywhere); % custos vaticana, stem down, between staff lines -custos_vaticana("Reverse Custos Ed. Vat.", "vaticana-d0", "vaticana_d0", +custos_vaticana("Reverse Custos Ed. Vat.", "vaticana-d0", "vaticanad0", dir_down, between_staff_lines); % custos vaticana, stem down, on_staff_line -custos_vaticana("Reverse Custos Ed. Vat.", "vaticana-d1", "vaticana_d1", +custos_vaticana("Reverse Custos Ed. Vat.", "vaticana-d1", "vaticanad1", dir_down, on_staff_line); % custos vaticana, stem down, anywhere -custos_vaticana("Reverse Custos Ed. Vat.", "vaticana-d2", "vaticana_d2", +custos_vaticana("Reverse Custos Ed. Vat.", "vaticana-d2", "vaticanad2", dir_down, anywhere); %%%%%%%% @@ -255,10 +259,10 @@ custos_vaticana("Reverse Custos Ed. Vat.", "vaticana-d2", "vaticana_d2", % % -def custos_mensural(expr verbose_name, internal_name, mudela_name, +def custos_mensural(expr verbose_name, internal_name, ly_name, direction, staffline_adjustment) = - fet_beginchar(verbose_name, internal_name, mudela_name) + fet_beginchar(verbose_name, internal_name, ly_name) save b_h,a_w; a_b:=1.54; % b_h * a_b / a_w = wd / ht @@ -299,27 +303,27 @@ def custos_mensural(expr verbose_name, internal_name, mudela_name, enddef; % custos mensural, stem up, between staff lines -custos_mensural("Custos Mensural", "mensural-u0", "mensural_u0", +custos_mensural("Custos Mensural", "mensural-u0", "mensuralu0", dir_up, between_staff_lines); % custos mensural, stem up, on staff line -custos_mensural("Custos Mensural", "mensural-u1", "mensural_u1", +custos_mensural("Custos Mensural", "mensural-u1", "mensuralu1", dir_up, on_staff_line); % custos mensural, stem up, anywhere -custos_mensural("Custos Mensural", "mensural-u2", "mensural_u2", +custos_mensural("Custos Mensural", "mensural-u2", "mensuralu2", dir_up, anywhere); % custos mensural, stem down, between staff lines -custos_mensural("Reverse Custos Mensural", "mensural-d0", "mensural_d0", +custos_mensural("Reverse Custos Mensural", "mensural-d0", "mensurald0", dir_down, between_staff_lines); % custos mensural, stem down, on staff line -custos_mensural("Reverse Custos Mensural", "mensural-d1", "mensural_d1", +custos_mensural("Reverse Custos Mensural", "mensural-d1", "mensurald1", dir_down, on_staff_line); % custos mensural, stem down, anywhere -custos_mensural("Reverse Custos Mensural", "mensural-d2", "mensural_d2", +custos_mensural("Reverse Custos Mensural", "mensural-d2", "mensurald2", dir_down, anywhere); fet_endgroup ("custodes")