X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Fparmesan-heads.mf;h=da64dbeb4b5a25a104f859a49bfb504dc5af3acc;hb=cc18fd6f82df460cc31695c4c31f47f45b7e434e;hp=0db8f40c691547ef4ba81cd829b5d340dfd7b3a3;hpb=b5ae9c51455439f4fda0879196529ef341858395;p=lilypond.git diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf index 0db8f40c69..da64dbeb4b 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--2006 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#; @@ -48,7 +49,7 @@ define_pixels(noteheight); % % -def draw_neo_brevis(expr brevwid) = +def draw_neomensural_brevis(expr brevwid) = save beamheight, head_width; save holeheight, stem_width; save serif_size, serif_protrude; @@ -82,33 +83,34 @@ def draw_neo_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); enddef; -def draw_neo_left_stemmed_head (expr wid) = - draw_neo_brevis(wid); +%%% This head does not seem to be used anywhere. Junk me? -- jr +def draw_neomensural_left_stemmed_head (expr wid) = + draw_neomensural_brevis(wid); - x6 = x7 = head_width - stem_width/2; + x6 = x7 = stem_width/2; y6 = y5; y7 = y5 - 2.25 staff_space; pickup pencircle scaled stem_width; draw z6 .. z7; enddef; -fet_beginchar("Left stemmed notehead", "lneo_mensural", "mensuralleftstemmedhead"); - draw_neo_left_stemmed_head (2 staff_space#); +%%% This head does not seem to be used anywhere. Junk me? -- jr +fet_beginchar("Left stemmed notehead", "slneomensural"); + draw_neomensural_left_stemmed_head (2 staff_space#); fet_endchar; % -% Some sources (eg Musix/OpusTeX think that the appendage should be on +% Some sources (eg. Musix/OpusTeX) think that the appendage should be on % the left, some say right. Right wins democratically. % -def draw_neo_longa (expr wid) = - draw_neo_brevis(wid); +def draw_neomensural_longa (expr wid) = + draw_neomensural_brevis(wid); save theta; x7r = head_width; @@ -128,19 +130,19 @@ enddef; % % (ze is wel breed) % -fet_beginchar("Maxima notehead", "-3neo_mensural", "mensuralmaximahead"); - draw_neo_longa (2.6 staff_space#) +fet_beginchar("Neo-mensural maxima notehead", "s-3neomensural"); + draw_neomensural_longa (2.6 staff_space#) fet_endchar; -fet_beginchar("Longa notehead", "-2neo_mensural", "mensurallongahead"); - draw_neo_longa (2 staff_space#) +fet_beginchar("Neo-mensural longa notehead", "s-2neomensural"); + draw_neomensural_longa (2 staff_space#) fet_endchar; -fet_beginchar("Brevis notehead", "-1neo_mensural", "mensuralbrevishead") - draw_neo_brevis(2 staff_space#); +fet_beginchar("Neo-mensural brevis notehead", "s-1neomensural") + draw_neomensural_brevis(2 staff_space#); fet_endchar; -def draw_neo_mensural_black_head (expr wid, height) = +def draw_neomensural_black_head (expr wid, height) = save head_width; head_width# = wid; set_char_box (0, head_width#, height/2, height/2); @@ -160,15 +162,15 @@ def draw_neo_mensural_black_head (expr wid, height) = filldraw z1 -- z2 -- z3 -- z4 -- cycle; enddef; -def draw_neo_mensural_open_head (expr wid, height)= - draw_neo_mensural_black_head (wid, height); +def draw_neomensural_open_head (expr wid, height)= + draw_neomensural_black_head (wid, height); save diamNW, diamSW; diamNW = length (z2 - z1) + blot_diameter; diamSW = length (z4 - z1) + blot_diameter; 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); @@ -180,36 +182,36 @@ def draw_neo_mensural_open_head (expr wid, height)= unfill z5 -- z6 -- z7 -- z8 --cycle; enddef; -fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralsemibrevishead") - draw_neo_mensural_open_head (staff_space#, noteheight#); -fet_endchar; - -fet_beginchar("Harmonic notehead (Neo-mensural open)","0harmonic","harmonichead") - draw_neo_mensural_open_head (1.3 staff_space#, 1.3 noteheight#); +% +% WL says the thin lines should be thinner. +% +fet_beginchar("Harmonic notehead (Neo-mensural open)", + "s0harmonic") + draw_neomensural_open_head (1.3 staff_space#, 1.3 noteheight#); charwx := head_width#; charwy := 0; fet_endchar; - -fet_beginchar("Neo-mensural open head","1neo_mensural","neomensuralminimahead") - draw_neo_mensural_open_head (staff_space#, noteheight#); +fet_beginchar("Neo-mensural semibrevis head","s0neomensural") + draw_neomensural_open_head (staff_space#, noteheight#); fet_endchar; -fet_beginchar("Neo-mensural black head","2neo_mensural","neomensuralsemiminimahead") - draw_neo_mensural_black_head (staff_space#, noteheight#); +fet_beginchar("Neo-mensural minima head","s1neomensural") + draw_neomensural_open_head (staff_space#, noteheight#); fet_endchar; +fet_beginchar("Neo-mensural semiminima head","s2neomensural") + draw_neomensural_black_head (staff_space#, noteheight#); +fet_endchar; - -def draw_brevis (expr wid) = - % TODO. For the moment, fall back to draw_neo_brevis. - draw_neo_brevis(wid); +def draw_mensural_brevis (expr wid) = + % TODO. For the moment, fall back to draw_neomensural_brevis. + draw_neomensural_brevis(wid); enddef; -def draw_left_stemmed_head (expr wid) = - draw_brevis(wid); - save theta; - +%%% This head does not seem to be used anywhere. Junk me? -- jr +def draw_mensural_left_stemmed_head (expr wid) = + draw_mensural_brevis(wid); x6 = x7 = stem_width/2; y6 = y5; y7 = y5 - 2.25staff_space; @@ -217,13 +219,8 @@ def draw_left_stemmed_head (expr wid) = draw z6 .. z7; enddef; -fet_beginchar("Left stemmed notehead", "lmensural", "mensuralleftstemmedhead"); - draw_left_stemmed_head (staff_space#) -fet_endchar; - -def draw_longa (expr wid) = - draw_brevis(wid); - +def draw_mensural_longa (expr wid) = + draw_mensural_brevis(wid); x6 = x7 = head_width - stem_width/2; y6 = y5; y7 = y5 - 2.25staff_space; @@ -231,33 +228,38 @@ def draw_longa (expr wid) = draw z6 .. z7; enddef; -fet_beginchar("Maxima notehead", "-3mensural", "mensuralmaximahead"); - draw_longa (2.0 staff_space#) +%%% This head does not seem to be used anywhere. Junk me? -- jr +fet_beginchar("Mensural left stemmed notehead", "slmensural"); + draw_mensural_left_stemmed_head (staff_space#) +fet_endchar; + +fet_beginchar("Mensural maxima notehead", "s-3mensural"); + draw_mensural_longa (2.0 staff_space#) fet_endchar; -fet_beginchar("Longa notehead", "-2mensural", "mensurallongahead"); - draw_longa (staff_space#) +fet_beginchar("Mensural longa notehead", "s-2mensural"); + draw_mensural_longa (staff_space#) fet_endchar; -fet_beginchar("Brevis notehead", "-1mensural", "mensuralbrevishead") - draw_brevis(staff_space#); +fet_beginchar("Mensural brevis notehead", "s-1mensural") + draw_mensural_brevis(staff_space#); fet_endchar; def draw_diamond_head (expr head_h, pen_w, pen_h, angle, open) = save head_width, head_height; head_height# = head_h; head_width# / head_height# = tand(angle); - define_pixels(head_width, head_height); set_char_box (0, head_width#, head_height#/2, head_height#/2); charwx := head_width# / 2; - charwy := head_height# / 2 - stafflinethickness#; + charwy := head_height# / 2 - linethickness#; + define_pixels(head_width, head_height); pickup pencircle - xscaled (min(blot_diameter, pen_w * head_width)) - yscaled (min(blot_diameter, pen_h * head_width)) + xscaled (max(blot_diameter, pen_w * head_width)) + yscaled (max(blot_diameter, pen_h * head_width)) rotated -angle; %% FIXME: replace "xpart (top z2)" (and, analogously, @@ -284,18 +286,33 @@ def draw_diamond_head (expr head_h, pen_w, pen_h, angle, open) = enddef; -fet_beginchar("Mensural open head","0mensural","mensuralsemibrevishead") +fet_beginchar("Mensural semibrevis 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 minima 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 semiminima head","s2mensural") draw_diamond_head (staff_space#, 0.15, 0.30, 30, false); fet_endchar; +fet_beginchar("Petrucci semibrevis head","s0petrucci") +% draw_diamond_head (1.8 staff_space#, 0.15, 0.40, 30, true); + draw_neomensural_open_head (staff_space#, 1.8 staff_space#); +fet_endchar; + +fet_beginchar("Petrucci minima head","s1petrucci") +% draw_diamond_head (1.8 staff_space#, 0.15, 0.40, 30, true); + draw_neomensural_open_head (staff_space#, 1.8 staff_space#); +fet_endchar; + +fet_beginchar("Petrucci semiminima head","s2petrucci") +% draw_diamond_head (1.8 staff_space#, 0.15, 0.40, 30, false); + draw_neomensural_black_head (staff_space#, 1.8 staff_space#); +fet_endchar; + %%%%%%%% % @@ -307,11 +324,12 @@ 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) = + straight, auctum, rev_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; @@ -335,21 +353,24 @@ def punctum_char (expr verbose_name, internal_name, ly_name, direction_sign# = -1; fi; - % convexity and excentricity - save u_convexity, u_excentricity; + % convexity and eccentricity + save u_convexity, u_eccentricity; if straight: u_convexity# = -0.01ht#; - u_excentricity# = 0.0ht#; % dummy + u_eccentricity# = 0.0ht#; % dummy elseif auctum: u_convexity# = -0.03ht#; - u_excentricity# = +0.25ht#; + u_eccentricity# = +0.25ht#; + elseif rev_auctum: + u_convexity# = -0.10ht#; + u_eccentricity# = -0.12ht#; else: u_convexity# = -0.05ht#; - u_excentricity# = 0.0ht#; % dummy + u_eccentricity# = 0.0ht#; % dummy fi; - save convexity, excentricity; + save convexity, eccentricity; convexity# = direction_sign# * u_convexity#; - excentricity# = direction_sign# * u_excentricity#; + eccentricity# = direction_sign# * u_eccentricity#; % y shift offset save yoffs; @@ -361,8 +382,8 @@ def punctum_char (expr verbose_name, internal_name, ly_name, yoffs# = 0.00ht#; fi - define_pixels(convexity, excentricity, yoffs, ht, wd); - pickup pencircle scaled stafflinethickness; + define_pixels(convexity, eccentricity, yoffs, ht, wd); + pickup pencircle scaled linethickness; path p; save height, yoffs_bt; @@ -378,22 +399,22 @@ def punctum_char (expr verbose_name, internal_name, ly_name, save box_top, box_bt; - if auctum: - z1a = (0.00wd + stafflinethickness/2, yoffs_bt); + if auctum or rev_auctum: + z1a = (0.00wd + linethickness/2, yoffs_bt); z2a = (0.21wd, yoffs_bt + 1.0*convexity); - z3a = (0.42wd - stafflinethickness/2, - yoffs_bt + 1.0*excentricity); + z3a = (0.42wd - linethickness/2, + yoffs_bt + 1.0*eccentricity); box_top# = height# + yoffs_bt# + - max(0, 1.0*convexity#, 1.0*excentricity#); + max(0, 1.0*convexity#, 1.0*eccentricity#); box_bt# = yoffs_bt# + - min(0, 1.0*convexity#, 1.0*excentricity#); + min(0, 1.0*convexity#, 1.0*eccentricity#); 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 +423,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 +440,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 +459,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, @@ -465,10 +486,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: @@ -493,10 +514,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} .. @@ -506,47 +527,43 @@ 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); + 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); + 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); + 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); + 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); + false, 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); + false, 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); + false, false, false, false, false, false, 1.0); % pes upper punctum (shifted variation) % @@ -554,20 +571,24 @@ 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); + false, false, false, false, true, false, 1.0); + +% small punctum as used in epiphonus +punctum_char("Ed. Vat. plica", "vaticana.plica", + false, false, false, false, false, + false, false, false, false, false, false, 0.6); % small punctum as used in epiphonus -punctum_char("Ed. Vat. plica", "vaticana_plica", "vatplicahead", +punctum_char("Ed. Vat. var plica", "vaticana.vplica", false, false, false, false, false, - false, false, false, false, false, 0.6); + false, true, false, false, false, true, 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); + false, false, true, true, false, false, 1.0); % excentric punctum as used in epiphonus (shifted variation) % @@ -575,29 +596,32 @@ 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, false, true, true, false, true, 1.0); + +% small punctum as used in cephalicus +punctum_char("Ed. Vat. rev. plica", "vaticana.reverse.plica", false, false, false, false, false, - false, true, true, false, true, 1.0); + false, false, true, false, false, false, 0.6); % small punctum as used in cephalicus -punctum_char("Ed. Vat. rev. plica", "vaticana_reverse_plica", "vatrplicahead", +punctum_char("Ed. Vat. rev. var plica", "vaticana.reverse.vplica", false, false, false, false, false, - false, true, false, false, false, 0.6); + false, true, true, false, false, true, 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); + 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); + 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; @@ -612,7 +636,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; @@ -624,40 +648,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); + true, false, 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); + true, false, 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; @@ -694,16 +711,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#; @@ -719,17 +735,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: @@ -740,15 +756,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); %%%%%%%% @@ -762,9 +778,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); @@ -784,13 +800,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#; @@ -798,7 +814,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;