X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Fparmesan-heads.mf;h=680a85f3217243761875f601b45e715529f7d00e;hb=9193ac6225e2beafb8ea5da2610c70dd610e03be;hp=0db8f40c691547ef4ba81cd829b5d340dfd7b3a3;hpb=b5ae9c51455439f4fda0879196529ef341858395;p=lilypond.git diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf index 0db8f40c69..680a85f321 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--2003 Juergen Reuter +% (c) 2001--2004 Juergen Reuter % % Neo-mensural heads originally by % Christian Mondrup and Mats Bengtsson @@ -33,6 +33,7 @@ fet_begingroup ("noteheads") % * height: Should match the top edge of the head. Affects vertical % collision handling. % +% TODO: should depth/height include appendages/stems? overdone_heads = 0; noteheight# := staff_space# + (1 + overdone_heads)*stafflinethickness#; @@ -128,15 +129,15 @@ enddef; % % (ze is wel breed) % -fet_beginchar("Maxima notehead", "-3neo_mensural", "mensuralmaximahead"); +fet_beginchar("Maxima notehead", "-3neo_mensural", "neomensuralmaximahead"); draw_neo_longa (2.6 staff_space#) fet_endchar; -fet_beginchar("Longa notehead", "-2neo_mensural", "mensurallongahead"); +fet_beginchar("Longa notehead", "-2neo_mensural", "neomensurallongahead"); draw_neo_longa (2 staff_space#) fet_endchar; -fet_beginchar("Brevis notehead", "-1neo_mensural", "mensuralbrevishead") +fet_beginchar("Brevis notehead", "-1neo_mensural", "neomensuralbrevishead") draw_neo_brevis(2 staff_space#); fet_endchar; @@ -168,7 +169,7 @@ def draw_neo_mensural_open_head (expr wid, height)= save hole_widthNW, hole_widthSW; hole_widthNW = 0.34 diamNW ; - hole_widthSW + 2.6 stafflinethickness = diamSW; + hole_widthSW + 2.6 linethickness = diamSW; (z7 + z5)/2 = (w/2, 0); (z8 + z6)/2 = (w/2, 0); @@ -184,7 +185,13 @@ fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralsemibrevishea draw_neo_mensural_open_head (staff_space#, noteheight#); fet_endchar; -fet_beginchar("Harmonic notehead (Neo-mensural open)","0harmonic","harmonichead") +% +% WL says the thin lines should be thinner. +% + +fet_beginchar("Harmonic notehead (Neo-mensural open)", + "0harmonic","harmonichead") + draw_neo_mensural_open_head (1.3 staff_space#, 1.3 noteheight#); charwx := head_width#; charwy := 0; @@ -253,7 +260,7 @@ def draw_diamond_head (expr head_h, pen_w, pen_h, angle, open) = head_height#/2, head_height#/2); charwx := head_width# / 2; - charwy := head_height# / 2 - stafflinethickness#; + charwy := head_height# / 2 - linethickness#; pickup pencircle xscaled (min(blot_diameter, pen_w * head_width)) @@ -362,7 +369,7 @@ def punctum_char (expr verbose_name, internal_name, ly_name, fi define_pixels(convexity, excentricity, yoffs, ht, wd); - pickup pencircle scaled stafflinethickness; + pickup pencircle scaled linethickness; path p; save height, yoffs_bt; @@ -379,9 +386,9 @@ def punctum_char (expr verbose_name, internal_name, ly_name, save box_top, box_bt; if auctum: - z1a = (0.00wd + stafflinethickness/2, yoffs_bt); + z1a = (0.00wd + linethickness/2, yoffs_bt); z2a = (0.21wd, yoffs_bt + 1.0*convexity); - z3a = (0.42wd - stafflinethickness/2, + z3a = (0.42wd - linethickness/2, yoffs_bt + 1.0*excentricity); box_top# = height# + yoffs_bt# + max(0, 1.0*convexity#, 1.0*excentricity#); @@ -390,10 +397,10 @@ def punctum_char (expr verbose_name, internal_name, ly_name, p = z1a .. {right}z2a .. {direction}z3a -- z3b{-direction} .. z2b{left} .. z1b -- cycle; elseif excentric: - z1a = (0.00wd + stafflinethickness/2, + z1a = (0.00wd + linethickness/2, yoffs_bt - 1.0*convexity); z2a = (0.08wd, yoffs_bt + 1.4*convexity); - z3a = (0.42wd - stafflinethickness/2, + z3a = (0.42wd - linethickness/2, yoffs_bt - 1.0*convexity); box_top# = height# + yoffs_bt# + max(-1.0*convexity#, 1.4*convexity#, 0); @@ -402,9 +409,9 @@ def punctum_char (expr verbose_name, internal_name, ly_name, p = z1a{direction} .. z2a{right} .. z3a -- z3b .. {left}z2b .. {-direction}z1b -- cycle; else: - z1a = (0.00wd + stafflinethickness/2, yoffs_bt); + z1a = (0.00wd + linethickness/2, yoffs_bt); z2a = (0.21wd, yoffs_bt + 1.0*convexity); - z3a = (0.42wd - stafflinethickness/2, yoffs_bt); + z3a = (0.42wd - linethickness/2, yoffs_bt); box_top# = height# + yoffs_bt# + max(0, 1.0*convexity#); box_bt# = yoffs_bt# + @@ -419,18 +426,18 @@ def punctum_char (expr verbose_name, internal_name, ly_name, filldraw p; fi; - pickup pencircle scaled 0.6stafflinethickness; + pickup pencircle scaled 0.6linethickness; save stem_bt; if left_stem: - z5=(0.00wd + 0.6stafflinethickness/2, yoffs); - z6=(0.00wd + 0.6stafflinethickness/2, yoffs - 1.1ht); + z5=(0.00wd + 0.6linethickness/2, yoffs); + z6=(0.00wd + 0.6linethickness/2, yoffs - 1.1ht); draw z5 -- z6; stem_bt# = yoffs# - 1.1ht#; elseif right_stem: - z5=(0.42wd - 0.6stafflinethickness/2, yoffs); - z6=(0.42wd - 0.6stafflinethickness/2, yoffs - 1.5ht); + z5=(0.42wd - 0.6linethickness/2, yoffs); + z6=(0.42wd - 0.6linethickness/2, yoffs - 1.5ht); draw z5 -- z6; stem_bt# = yoffs# - 1.5ht#; else: @@ -438,12 +445,12 @@ def punctum_char (expr verbose_name, internal_name, ly_name, fi; set_char_box(0.00wd#, 0.42wd#, - max(0, -box_bt#, -stem_bt#) + stafflinethickness#/2, - max(0, box_top#) + stafflinethickness#/2); + max(0, -box_bt#, -stem_bt#) + linethickness#/2, + max(0, box_top#) + linethickness#/2); if linea: save linea_width, linea_height; - linea_width# = 0.6 stafflinethickness#; + linea_width# = 0.6 linethickness#; linea_height# = 0.7 ht#; define_pixels (linea_width, linea_height); draw_block ((-0.10wd - linea_width/2, @@ -493,10 +500,10 @@ def inclinatum_char(expr verbose_name, internal_name, ly_name, fi; if auctum: - pickup pencircle scaled stafflinethickness; + pickup pencircle scaled linethickness; save za, zb, zc; pair za, zb, zc; - za = (0, -0.5 head_height + stafflinethickness); + za = (0, -0.5 head_height + linethickness); zb = 0.6 (za + zc); zc = za + (0.52 head_width, 0); draw za{(0,-1) rotated alpha#} .. {right}zb{right} .. @@ -612,7 +619,7 @@ fet_beginchar("Ed. Vat. quilisma", "vaticana_quilisma", "vatquilismahead") black_notehead_width# := wd#; define_pixels(ht, wd); - pickup pencircle xscaled stafflinethickness yscaled 0.44ht; + pickup pencircle xscaled linethickness yscaled 0.44ht; lft x1 = 0.00wd; bot y1 = -0.28ht; x2 = 0.11wd; y2 = -0.14ht; x3 = 0.12wd; y3 = +0.03ht; @@ -719,17 +726,17 @@ def punctum_char (expr verbose_name, internal_name, ly_name, draw z1 .. z2; pickup pencircle - xscaled stafflinethickness + xscaled linethickness yscaled blot_diameter; if left_down_stem: - z4=(0.00wd + stafflinethickness/2, blot_diameter/2); - z5=(0.00wd + stafflinethickness/2, - 1.25ht); + z4=(0.00wd + linethickness/2, blot_diameter/2); + z5=(0.00wd + linethickness/2, - 1.25ht); draw z4 .. z5; set_char_box(0.0, 0.4wd#, 1.25ht#, 0.25ht#); elseif left_up_stem: - z4=(0.00wd + stafflinethickness/2, blot_diameter/2); - z5=(0.00wd + stafflinethickness/2, + 1.25ht); + z4=(0.00wd + linethickness/2, blot_diameter/2); + z5=(0.00wd + linethickness/2, + 1.25ht); draw z4 .. z5; set_char_box(0.0, 0.4wd#, 0.25ht#, 1.25ht#); else: @@ -798,7 +805,7 @@ fet_beginchar("Hufnagel pes lower punctum", "hufnagel_lpes", "huflpeshead") set_char_box(0, width#, height#/2, height#/2); - pickup pencircle scaled stafflinethickness; + pickup pencircle scaled linethickness; define_pixels(width, height); rt x3 = -lft x1 = width/2;