X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Fparmesan-clefs.mf;h=08c644f332f277328a4add3dda636b47f27ea405;hb=599f815907b517eedc6223d302c789477ab3ab05;hp=98f1ebf46379432ca9c9f4aaa58b4717da63c545;hpb=4f6174821ca9275a1c1fc77b7e1ea6959b076227;p=lilypond.git diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf index 98f1ebf463..08c644f332 100644 --- a/mf/parmesan-clefs.mf +++ b/mf/parmesan-clefs.mf @@ -54,12 +54,14 @@ def draw_vaticana_do_clef(expr exact_center, reduction) = reduced_il# = staff_space# * reduction; - set_char_box(0.0reduced_il#, 0.5reduced_il#, - 0.8reduced_il#, 0.8reduced_il#); + set_char_box(0 - xpart exact_center, + 0.5reduced_il# + xpart exact_center, + 0.8reduced_il# - ypart exact_center, + 0.8reduced_il# + ypart exact_center); define_pixels(reduced_il); - pickup pencircle xscaled 0.6stafflinethickness yscaled 0.6reduced_il; + pickup pencircle xscaled 0.6linethickness yscaled 0.6 reduced_il; save za, zb, zc, zd, ze, zf; pair za, zb, zc, zd, ze, zf; @@ -96,23 +98,25 @@ def draw_vaticana_fa_clef(expr exact_center, reduction) = pair za, zb, zc, zd, ze; %left-handed punctum - pickup pencircle xscaled 0.6stafflinethickness yscaled 0.5reduced_il; + pickup pencircle xscaled 0.6linethickness yscaled 0.5reduced_il; lft za = exact_center + (+0.00reduced_il, +0.00reduced_il); zb = exact_center + (+0.25reduced_il, +0.05reduced_il); rt zc = exact_center + (+0.50reduced_il, -0.05reduced_il); draw za .. zb .. zc; %stem - pickup pencircle scaled 0.6stafflinethickness; + pickup pencircle scaled 0.6linethickness; xpart zc = xpart zd = xpart ze; ypart zd = ypart exact_center = bot ypart ze + 1.5reduced_il; draw zd -- ze; %right-handed puncta as in do clef - draw_vaticana_do_clef(exact_center + (0.55reduced_il, 0), reduction); + draw_vaticana_do_clef(exact_center + (0.55reduced_il#, 0), reduction); - set_char_box(0.0reduced_il#, 1.05reduced_il#, - 1.5reduced_il#, 0.8reduced_il#); + set_char_box(0 - xpart exact_center, + 1.05reduced_il# + xpart exact_center, + 1.5reduced_il# - ypart exact_center, + 0.8reduced_il# + ypart exact_center); enddef; @@ -137,7 +141,7 @@ fet_endchar; def draw_medicaea_do_clef(expr exact_center, reduction) = save reduced_il, reduced_slt; reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; + reduced_slt# = linethickness# * reduction; define_pixels(reduced_il); define_pixels(reduced_slt); @@ -179,8 +183,10 @@ def draw_medicaea_do_clef(expr exact_center, reduction) = = bot ypart za + 1.5 reduced_il; draw za -- zb; - set_char_box(0, 1.0reduced_il#, - 1.5reduced_il#, 1.5reduced_il#); + set_char_box(0 - xpart exact_center, + 1.0reduced_il# + xpart exact_center, + 1.5reduced_il# - ypart exact_center, + 1.5reduced_il# + ypart exact_center); enddef; @@ -201,7 +207,7 @@ def draw_medicaea_fa_clef(expr exact_center, reduction) = save reduced_il, reduced_slt; reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; + reduced_slt# = linethickness# * reduction; define_pixels(reduced_il); define_pixels(reduced_slt); @@ -209,7 +215,7 @@ def draw_medicaea_fa_clef(expr exact_center, reduction) = pair za, zb, zc, zd, ze; %stem - pickup pencircle scaled stafflinethickness; + pickup pencircle scaled linethickness; xpart za = xpart zb = xpart exact_center + 0.4reduced_il; ypart za = ypart exact_center = bot ypart zb + 1.5reduced_il; @@ -222,9 +228,12 @@ def draw_medicaea_fa_clef(expr exact_center, reduction) = draw zc -- zd; %right-handed puncta as in do clef - draw_medicaea_do_clef(exact_center + (0.7reduced_il, 0), reduction); + draw_medicaea_do_clef(exact_center + (0.7reduced_il#, 0), reduction); - set_char_box(0, 1.7reduced_il#, 1.5reduced_il#, 1.5reduced_il#); + set_char_box(0 - xpart exact_center, + 1.7reduced_il# + xpart exact_center, + 1.5reduced_il# - ypart exact_center, + 1.5reduced_il# + ypart exact_center); enddef; @@ -247,92 +256,91 @@ fet_endchar; % % % -brevis_wid# := 2 staff_space#; -def draw_brevis(expr exact_center, reduction, small_width, small_height) = - % - % inspired by function draw_brevis of - % feta-bolletjes.mf - % - save reduced_slt, reduced_nht; - save stem_width, head_width; - save serif_size, serif_protrude; - save holeheight, beamheight; +% +% width: interval from left end to right end +% height: interval from bottom of lower beam to top of upper beam +% exact_center: the coordinates of the vertical center point of the +% left edge. +% +def draw_brevis(expr exact_center, bwidth, bheight, blinethickness) = - reduced_slt# = stafflinethickness# * reduction; - reduced_nht# = noteheight# * reduction; - stem_width# = 1.4 reduced_slt#; - if small_width: - head_width# = 0.5brevis_wid# * reduction; - else: - head_width# = brevis_wid# * reduction; - fi; - if small_height: - serif_size# = 0.64 reduced_slt#; - serif_protrude# = 0.96 serif_size#; - holeheight# = 3 reduced_slt#; - beamheight# = 0.32(reduced_nht# - holeheight#); - else: - serif_size# = 1.0 reduced_slt#; - serif_protrude# = 1.5 serif_size#; - holeheight# = 3 reduced_slt#; - beamheight# = 0.5(reduced_nht# - holeheight#); - fi; - define_pixels(reduced_slt); - define_pixels(stem_width); - define_pixels(head_width); - define_pixels(serif_size); - define_pixels(serif_protrude); - define_pixels(beamheight); + save xoffs, yoffs, brevis_width, brevis_height, linethickness; + xoffs# = xpart exact_center; + yoffs# = ypart exact_center; + brevis_width# = bwidth; brevis_height# = bheight; + linethickness# = blinethickness; + + save beam_width, beam_height, serif_size, serif_protrude, hole_height; + beam_width# = 1.4 linethickness#; + hole_height# = 3 linethickness#; + 2 beam_height# + hole_height# = brevis_height#; + serif_size# = (hole_height# - linethickness#)/2; + serif_protrude# = 1.5 serif_size#; - penpos1(stem_width, 0); - penpos2(stem_width, 0); - penpos3(beamheight, 90); - penpos4(beamheight, 90); - penpos5(stem_width, 180); + define_pixels(xoffs, yoffs, brevis_width, brevis_height, linethickness); + define_pixels(beam_width, beam_height, serif_size, serif_protrude); - z1l = exact_center; - z2l = z1l + (0, -reduced_slt/2); + penpos1(beam_width, 0); + penpos2(beam_width, 0); + penpos3(beam_height, 90); + penpos4(beam_height, 90); + penpos5(beam_width, 180); + z1l = (xoffs, yoffs); + z2l = z1l + (0, -linethickness); z3r = z2r + serif_size*(1,-1); y4r = y3r; - x4l = x1l + head_width/2; + x4l = x1l + brevis_width/2; z5l = z3l + (-serif_size, -serif_protrude); - - penlabels(1,2,3,4,5); fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right} -- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle; -enddef; + addto currentpicture also currentpicture + yscaled -1 shifted (0, 2*yoffs); -def draw_neo_mensural_c_clef(expr exact_center, reduction) = - draw_brevis(exact_center, reduction, false, false); + pickup pencircle scaled linethickness; + top y6 = yoffs + brevis_height/2; + bot y7 = yoffs - brevis_height/2; + lft x6 = lft x7 = xoffs; + draw z6 -- z7; + + addto currentpicture also currentpicture + xscaled -1 shifted (2xoffs + brevis_width, 0); +enddef; - save reduced_il, reduced_slt; - save stem_width; +def draw_neo_mensural_c_clef(expr exact_center, reduction) = + save reduced_il, reduced_slt, stem_width; reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; + reduced_slt# = linethickness# * reduction; stem_width# = 1.4 reduced_slt#; + define_pixels(reduced_il, reduced_slt, stem_width); - define_pixels(reduced_il); - define_pixels(reduced_slt); - define_pixels(stem_width); + draw_brevis(exact_center + (3reduced_slt#, 0), + 2reduced_il#, reduced_il#, reduced_slt#); - pickup pencircle xscaled stem_width yscaled blot_diameter; - z6 = exact_center + (stem_width/2, 0); - z7 = z6 + (0, -2reduced_il); - z8 = z6 + (-3reduced_slt, 0); - z9 - z8 = z7 - z6; - draw z6 .. z7; - draw z8 .. z9; + save xoffs, yoffs; + xoffs# = xpart exact_center; + yoffs# = ypart exact_center; + define_pixels(xoffs, yoffs); - addto currentpicture also currentpicture - yscaled -1 shifted (0, 2*(ypart exact_center)); - addto currentpicture also currentpicture - xscaled -1 shifted (2x4l,0); - - set_char_box(3reduced_slt#, head_width# +3reduced_slt#, - 2reduced_il#, 2reduced_il#); + pickup pencircle xscaled stem_width yscaled blot_diameter; + lft x8 = lft x9 = xoffs; + lft x10 = lft x11 = lft x8 + 3reduced_slt; + rt x12 = rt x13 = lft x10 + 2reduced_il; + rt x14 = rt x15 = rt x12 + 3reduced_slt; + top y9 - bot y8 = 4reduced_il; + top y9 + bot y8 = 2yoffs; + y12 = y14 = y10 = y8; y13 = y15 = y11 = y9; + draw z8 -- z9; + draw z10 -- z11; + draw z12 -- z13; + draw z14 -- z15; + + set_char_box(0 - xpart exact_center, + 2reduced_il# + 6reduced_slt# + xpart exact_center, + 2reduced_il# - ypart exact_center, + 2reduced_il# + ypart exact_center); enddef; @@ -343,59 +351,54 @@ fet_beginchar("neo-mensural c clef", "neo_mensural_c", "neomenscclef") draw_neo_mensural_c_clef((0,0), 1.0); fet_endchar; fet_beginchar("neo-mensural c clef", "neo_mensural_c_change", "cneomenscclef") - draw_neo_mensural_c_clef((1.3 staff_space#,0), .8); + draw_neo_mensural_c_clef((0,0), .8); fet_endchar; def draw_petrucci_c_clef(expr exact_center, flare_align, reduction) = % inspired by Josquin Desprez, "Stabat Mater", Libro tertio, % 1519, printed by Petrucci, in: MGG, volume 7, Table 11. - draw_brevis(exact_center, reduction, true, true); - - save half_reduced_il, reduced_il, reduced_slt; - save stem_width, interline; - save left_depth, left_height; + % Also by Petrucci's Canti C, Venedig 1503. In: MGG, volume + % 9, p. 1681/1682. - half_reduced_il# = staff_space# * sqrt(reduction); + save reduced_il, reduced_slt; reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; - stem_width# = 1.4 reduced_slt#; - interline# = staff_space#; + reduced_slt# = linethickness# * reduction; + define_pixels(reduced_il); + + draw_brevis(exact_center + (0, 0.5staff_space#), + reduced_il#, reduced_il#, reduced_slt#); + addto currentpicture also currentpicture shifted (0, -staff_space); + + save half_reduced_il, left_depth, left_height; + half_reduced_il# = staff_space# * sqrt(reduction); left_height# = half_reduced_il# * min(3.2, 3.2 + 0.2 + flare_align); left_depth# = half_reduced_il# * min(3.2, 3.2 + 0.2 - flare_align); define_pixels(half_reduced_il); - define_pixels(reduced_il); - define_pixels(reduced_slt); - define_pixels(stem_width); - define_pixels(interline); define_pixels(left_depth, left_height); - addto currentpicture also currentpicture - yscaled -1 shifted (0, 2*(ypart exact_center) - interline); - - addto currentpicture also currentpicture - xscaled -1 shifted (reduction*2x4l,0); - - addto currentpicture also currentpicture - yscaled -1 shifted (0, 4*(ypart exact_center)); + save xoffs, yoffs; + xoffs# = xpart exact_center; + yoffs# = ypart exact_center; + define_pixels(xoffs, yoffs); - pickup pencircle xscaled stem_width yscaled blot_diameter; - - xpart z6 = xpart z7 = xpart exact_center + stem_width/2; - ypart z6 = ypart exact_center + left_height; - ypart z7 = ypart exact_center - left_depth; - draw z6 .. z7; - - xpart z8 = xpart z9 = reduction*2x4l - xpart exact_center - stem_width/2; - ypart z8 = min(ypart z6 - 0.2*half_reduced_il, - xpart exact_center + 2.2half_reduced_il); - ypart z9 = max(ypart z7 + 0.2*half_reduced_il, - xpart exact_center - 2.2half_reduced_il); + pickup pencircle xscaled 1.4 linethickness yscaled blot_diameter; + lft x8 = lft x9 = xoffs; + top y8 = yoffs + left_height; + bot y9 = yoffs - left_depth; draw z8 .. z9; - set_char_box(0, head_width#, left_depth#, left_height#); + rt x10 = rt x11 = xoffs + brevis_width; + y10 = min(y8 - 0.2*half_reduced_il, yoffs + 2.2half_reduced_il); + y11 = max(y9 + 0.2*half_reduced_il, yoffs - 2.2half_reduced_il); + draw z10 .. z11; + + set_char_box(0 - xpart exact_center, + reduced_il# + xpart exact_center, + left_depth# - ypart exact_center, + left_height# + ypart exact_center); enddef; @@ -406,7 +409,7 @@ fet_beginchar("petrucci c1 clef", "petrucci_c1", "petruccic1clef") draw_petrucci_c_clef((0,0), +2, 1.0); fet_endchar; fet_beginchar("petrucci c1 clef", "petrucci_c1_change", "cpetruccic1clef") - draw_petrucci_c_clef((1.3 staff_space#,0), +2, .8); + draw_petrucci_c_clef((0,0), +2, .8); fet_endchar; fet_beginchar("petrucci c2 clef", "petrucci_c2", "petruccic2clef") @@ -416,7 +419,7 @@ fet_beginchar("petrucci c2 clef", "petrucci_c2", "petruccic2clef") draw_petrucci_c_clef((0,0), +1, 1.0); fet_endchar; fet_beginchar("petrucci c2 clef", "petrucci_c2_change", "cpetruccic2clef") - draw_petrucci_c_clef((1.3 staff_space#,0), +1, .8); + draw_petrucci_c_clef((0,0), +1, .8); fet_endchar; fet_beginchar("petrucci c3 clef", "petrucci_c3", "petruccic3clef") @@ -426,7 +429,7 @@ fet_beginchar("petrucci c3 clef", "petrucci_c3", "petruccic3clef") draw_petrucci_c_clef((0,0), 0, 1.0); fet_endchar; fet_beginchar("petrucci c3 clef", "petrucci_c3_change", "cpetruccic3clef") - draw_petrucci_c_clef((1.3 staff_space#,0), 0, .8); + draw_petrucci_c_clef((0,0), 0, .8); fet_endchar; fet_beginchar("petrucci c4 clef", "petrucci_c4", "petruccic4clef") @@ -436,7 +439,7 @@ fet_beginchar("petrucci c4 clef", "petrucci_c4", "petruccic4clef") draw_petrucci_c_clef((0,0), -1, 1.0); fet_endchar; fet_beginchar("petrucci c4 clef", "petrucci_c4_change", "cpetruccic4clef") - draw_petrucci_c_clef((1.3 staff_space#,0), -1, .8); + draw_petrucci_c_clef((0,0), -1, .8); fet_endchar; fet_beginchar("petrucci c5 clef", "petrucci_c5", "petruccic5clef") @@ -446,26 +449,46 @@ fet_beginchar("petrucci c5 clef", "petrucci_c5", "petruccic5clef") draw_petrucci_c_clef((0,0), -2, 1.0); fet_endchar; fet_beginchar("petrucci c5 clef", "petrucci_c5_change", "cpetruc5iceclef") - draw_petrucci_c_clef((1.3 staff_space#,0), -2, .8); + draw_petrucci_c_clef((0,0), -2, .8); fet_endchar; def draw_mensural_c_clef(expr exact_center, reduction) = % inspired by Ockeghem, "Missa Prolationum", in: MGG, volume % 9, table 94. - draw_petrucci_c_clef(exact_center, 0, reduction); - addto currentpicture also currentpicture - shifted (0, -interline); + save reduced_il; + reduced_il# = staff_space# * reduction; + draw_brevis(exact_center + (0, 0.5staff_space#), + 2reduced_il#, 0.8staff_space#, 0.8linethickness#); + define_pixels(reduced_il); + addto currentpicture also currentpicture shifted (0, -staff_space); + addto currentpicture also currentpicture shifted (0, -staff_space); save half_reduced_il; - save left_depth, left_height; - half_reduced_il# = staff_space# * sqrt(reduction); - left_height# = 3.2 * half_reduced_il#; - left_depth# = left_height# + interline#; + define_pixels(half_reduced_il); + + save xoffs, yoffs; + xoffs# = xpart exact_center; + yoffs# = ypart exact_center; + define_pixels(xoffs, yoffs); - set_char_box(0, head_width#, left_depth#, left_height#); + pickup pencircle xscaled 1.4 linethickness yscaled blot_diameter; + lft x8 = lft x9 = xoffs; + top y8 = yoffs + 2.2 half_reduced_il; + bot y9 = yoffs - 2.2 half_reduced_il - staff_space; + draw z8 .. z9; + + rt x10 = rt x11 = xoffs + brevis_width; + y10 = yoffs + 1.4half_reduced_il; + y11 = yoffs - 1.4half_reduced_il - staff_space; + draw z10 .. z11; + + set_char_box(0 - xpart exact_center, + 2reduced_il# + xpart exact_center, + -yoffs# + 2.2 half_reduced_il# + staff_space# - ypart exact_center, + yoffs# + 2.2 half_reduced_il# + ypart exact_center); enddef; @@ -518,18 +541,18 @@ def draw_petrucci_f_clef(expr exact_center, reduction) = % Campra, "Entr'ee des s'er'enades" (1710), in: MGG, volume 2, % col. 1649 ("Contredanse"), fig. 2. % - draw_brevis(exact_center, reduction, true, false); save reduced_il, reduced_slt; - save stem_width, interline; - reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; - stem_width# = 1.4 reduced_slt#; - interline# = staff_space#; - + reduced_slt# = linethickness# * reduction; define_pixels(reduced_il); define_pixels(reduced_slt); + + draw_brevis(exact_center, reduced_il#, reduced_il#, reduced_slt#); + + save stem_width, interline; + stem_width# = 1.4 reduced_slt#; + interline# = staff_space#; define_pixels(stem_width); define_pixels(interline); @@ -541,34 +564,36 @@ def draw_petrucci_f_clef(expr exact_center, reduction) = % brevis stem pickup pencircle xscaled stem_width yscaled blot_diameter; - z6 = exact_center + (2x4l - stem_width/2, 0); - z7 = z6 + (0, -4reduced_il); - draw z6 .. z7; + rt z8 = exact_center + (reduced_il, 0); + z9 = z8 + (0, -4reduced_il); + draw z8 .. z9; % upper diamond draw_diamond(exact_center + (1.6interline*reduction, interline/2), reduction); pickup pencircle xscaled stem_width yscaled blot_diameter; - z8 = exact_center + + z10 = exact_center + (1.6interline*reduction + stem_width/2, interline*reduction); - z9 = z8 + (0, 1.5interline*reduction); - draw z8 .. z9; % diamond stem + top z11 = z10 + (0, 1.5interline*reduction); + draw z10 .. z11; % diamond stem % lower diamond draw_diamond(exact_center + (1.6interline*reduction, -interline/2), reduction); pickup pencircle xscaled stem_width yscaled blot_diameter; - z10 = exact_center + + z12 = exact_center + (1.6interline*reduction - stem_width/2, -interline*reduction); - z11 = z10 + (0, -3.5interline*reduction); - draw z10 .. z11; % diamond stem + bot z13 = z12 + (0, -3.5interline*reduction); + draw z12 .. z13; % diamond stem save reduced_il, rh_height, rh_width; reduced_il# = staff_space# * reduction; rh_height# = 1.2reduced_il#; rh_width# / rh_height# = tand(30); - set_char_box(0, 1.6interline#*reduction + 0.5rh_width#, - 4.5*interline#*reduction, 2.5*interline#*reduction); + set_char_box(0 - xpart exact_center, + 1.6interline#*reduction + 0.5rh_width# + xpart exact_center, + 4.5*interline#*reduction - ypart exact_center, + 2.5*interline#*reduction + ypart exact_center); enddef; @@ -590,35 +615,41 @@ def draw_mensural_f_clef(expr exact_center, reduction) = % Booke of Songes" (1597), in: MGG, volume 3, col. 721 % ("Dowland"), fig. 3. - save reduced_slt, stem_width, reduced_nht, holeheight, beamheight; + save width, reduced_slt, stem_width, dot_diameter; - reduced_slt# = stafflinethickness# * reduction; + width# = 1.2staff_space# * reduction; + reduced_slt# = linethickness# * reduction; stem_width# = 1.4 reduced_slt#; - reduced_nht# = noteheight# * reduction; - holeheight# = 3 reduced_slt#; - beamheight# = 0.4(reduced_nht# - holeheight#); - - define_pixels(beamheight, stem_width, staff_space); + dot_diameter# = 0.1 reduction * staff_space#; + define_pixels(width, stem_width, staff_space, dot_diameter); pickup pencircle - xscaled beamheight + xscaled 0.2width yscaled stem_width rotated 45; - draw - exact_center + (1.0 staff_space, 0.55 staff_space) -- - exact_center + (1.1 staff_space, 0.45 staff_space); + % half circle + lft z5 = (0, 0); + draw halfcircle scaled width rotated -90 + shifted (z5-exact_center); - draw - exact_center + (1.1 staff_space, -0.55 staff_space) -- - exact_center + (1.1 staff_space, -0.45 staff_space); - draw halfcircle scaled 1.1 staff_space rotated -90 - shifted (-exact_center + (+0.05 staff_space, 0)); + % upper dot + rt x2 = xpart exact_center + width; + top y1 = ypart exact_center + 0.5width; + z2 - z1 = (dot_diameter, -dot_diameter); + draw z1 -- z2; - set_char_box(0.5beamheight#, 1.1staff_space# + 0.5beamheight#, - 0.55staff_space# + 0.5stem_width#, - 0.55staff_space# + 0.5stem_width#); + % lower dot + x3 = x1; + top y1 - bot y4 = width; + z4 - z3 = (dot_diameter, -dot_diameter); + draw z3 -- z4; + + set_char_box(0 - xpart exact_center, + width# + xpart exact_center, + 0.5width# - ypart exact_center, + 0.5width# + ypart exact_center); enddef; fet_beginchar("mensural f clef", "mensural_f", "mensfclef") @@ -637,6 +668,14 @@ def draw_mensural_g_clef(expr exact_center, reduction) = % TODO: Rewrite me! This clef looks completely awful! --jr % + + % + % This code is completely undebuggable. + % + % the shift command is forbidden because (pen)labels come out + % completely wrong + % + % % inspired by Francisco Guerrero, "Lib. 1. Missarum" (1566), % in: MGG, volume 3, col. 858 ("Ducis"); also by Stefano @@ -654,14 +693,16 @@ def draw_mensural_g_clef(expr exact_center, reduction) = reduced_il#=staff_space#*reduction; - set_char_box(0.0reduced_il#, 1.2reduced_il#, - 0.8reduced_il#, 1.5reduced_il#); + set_char_box(0 - xpart exact_center, + 1.2reduced_il# + xpart exact_center, + 0.8reduced_il# - ypart exact_center, + 1.5reduced_il# + ypart exact_center); stem_width# = 0.17 reduced_il#; height# = 1.5 reduced_il#; width# = 1.13 reduced_il#; apex_o# = 0.02 reduced_il#; - hair# = 3 stafflinethickness#; + hair# = 3 linethickness#; define_pixels(reduced_il, stem_width, height, width, apex_o, hair); penpos1(2 stem_width, -142); @@ -718,6 +759,10 @@ def draw_mensural_g_clef(expr exact_center, reduction) = enddef; +if 0 = 1: + % + % This clef is switched due to path problems at smaller sizes. + % fet_beginchar("mensural g clef", "mensural_g", "mensgclef") if test = 1: draw_staff(-1,3, 0.0); @@ -728,6 +773,7 @@ fet_beginchar("mensural g clef", "mensural_g_change", "cmensgclef") draw_mensural_g_clef((0,0), .8); fet_endchar; +fi; def draw_petrucci_g_clef(expr exact_center, reduction) = @@ -737,11 +783,13 @@ def draw_petrucci_g_clef(expr exact_center, reduction) = save reduced_il, reduced_slt; reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; + reduced_slt# = linethickness# * reduction; define_pixels(reduced_il, reduced_slt); - set_char_box(0, 1.25 reduced_il#, - 0.65 reduced_il#, 3.80 reduced_il#); + set_char_box(0 - xpart exact_center, + 1.25 reduced_il# + xpart exact_center, + 0.65 reduced_il# - ypart exact_center, + 3.80 reduced_il# + ypart exact_center); save za, zb, zc, zd, ze, zf, zg, zh, zi, zj; pair za, zb, zc, zd, ze, zf, zg, zh, zi, zj; @@ -821,16 +869,18 @@ def draw_hufnagel_do_clef(expr exact_center, reduction) = save za, zb, zc, zd, ze, zf; pair za, zb, zc, zd, ze, zf; - za = exact_center + (+0.30reduced_il, +.45reduced_il); - zb = exact_center + (+0.20reduced_il, +.45reduced_il); - zc = exact_center + (-0.10reduced_il, +.60reduced_il); - zd = exact_center + (-0.40reduced_il, +.45reduced_il); - ze = exact_center + (-0.40reduced_il, -.45reduced_il); - zf = exact_center + (-0.20reduced_il, -.55reduced_il); + za = exact_center + (0.90reduced_il, +.45reduced_il); + zb = exact_center + (0.80reduced_il, +.45reduced_il); + zc = exact_center + (0.50reduced_il, +.60reduced_il); + zd = exact_center + (0.20reduced_il, +.45reduced_il); + ze = exact_center + (0.20reduced_il, -.45reduced_il); + zf = exact_center + (0.40reduced_il, -.55reduced_il); draw za .. zb .. zc -- zd -- ze -- zf; - set_char_box(0.60reduced_il#, 0.50reduced_il#, - 0.70reduced_il#, 0.75reduced_il#); + set_char_box(0 - xpart exact_center, + 1.10reduced_il# + xpart exact_center, + 0.70reduced_il# - ypart exact_center, + 0.75reduced_il# + ypart exact_center); enddef; @@ -841,7 +891,7 @@ fet_beginchar("Hufnagel do clef", "hufnagel_do", "hufnageldoclef") draw_hufnagel_do_clef((0,0), 1.0); fet_endchar; fet_beginchar("Hufnagel do clef", "hufnagel_do_change", "chufnageldoclef") - draw_hufnagel_do_clef((1.3 staff_space#,0), .8); + draw_hufnagel_do_clef((0,0), .8); fet_endchar; @@ -863,24 +913,26 @@ def draw_hufnagel_fa_clef(expr exact_center, reduction) = save za, zb, zc, zd, ze, zf; pair za, zb, zc, zd, ze, zf; - za = exact_center + (+0.30reduced_il, +0.70reduced_il); - zb = exact_center + (+0.20reduced_il, +0.70reduced_il); - zc = exact_center + (-0.10reduced_il, +0.85reduced_il); - zd = exact_center + (-0.40reduced_il, +0.70reduced_il); - ze = exact_center + (-0.40reduced_il, -1.10reduced_il); + za = exact_center + (0.90reduced_il, +0.70reduced_il); + zb = exact_center + (0.80reduced_il, +0.70reduced_il); + zc = exact_center + (0.50reduced_il, +0.85reduced_il); + zd = exact_center + (0.20reduced_il, +0.70reduced_il); + ze = exact_center + (0.20reduced_il, -1.10reduced_il); draw za .. zb .. zc -- zd -- ze; save zg, zh, zi, zj; pair zg, zh, zi, zj; - zg = exact_center + (+0.30reduced_il, -0.05reduced_il); - zh = exact_center + (+0.20reduced_il, -0.05reduced_il); - zi = exact_center + (-0.10reduced_il, +0.10reduced_il); - zj = exact_center + (-0.40reduced_il, -0.05reduced_il); + zg = exact_center + (0.90reduced_il, -0.05reduced_il); + zh = exact_center + (0.80reduced_il, -0.05reduced_il); + zi = exact_center + (0.50reduced_il, +0.10reduced_il); + zj = exact_center + (0.20reduced_il, -0.05reduced_il); draw zg .. zh .. zi -- zj; - set_char_box(0.60reduced_il#, 0.60reduced_il#, - 1.15reduced_il#, 1.00reduced_il#); + set_char_box(0 - xpart exact_center, + 1.20reduced_il# + xpart exact_center, + 1.15reduced_il# - ypart exact_center, + 1.00reduced_il# + ypart exact_center); enddef; @@ -897,9 +949,11 @@ fet_endchar; def draw_hufnagel_do_fa_clef(expr exact_center, reduction) = draw_hufnagel_do_clef(exact_center, reduction); - draw_hufnagel_fa_clef(exact_center + (0, -2staff_space), reduction); - set_char_box(0.60reduced_il#, 0.60reduced_il#, - 1.15reduced_il# + 2staff_space#, 0.75reduced_il#); + draw_hufnagel_fa_clef(exact_center + (0, -2staff_space#), reduction); + set_char_box(0 - xpart exact_center, + 1.20reduced_il# + xpart exact_center, + 1.15reduced_il# + 2staff_space# - ypart exact_center, + 0.75reduced_il# + ypart exact_center); enddef;