X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Fparmesan-clefs.mf;h=b58b85d672d23ecc1945aebca78099492cc9c4ae;hb=82bc9ad690e201aaa55694f8b92261ae7338f56a;hp=c2d2cff852c30004057649aba1e5d9d22c00852d;hpb=5de9238f9cba2fb42e9bdf713d8312599a5ad515;p=lilypond.git diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf index c2d2cff852..b58b85d672 100644 --- a/mf/parmesan-clefs.mf +++ b/mf/parmesan-clefs.mf @@ -1,13 +1,12 @@ % Feta (not the Font-En-Tja) music font -- ancient clefs % This file is part of LilyPond, the GNU music typesetter. % -% Copyright (C) 2001--2012 Juergen Reuter +% Copyright (C) 2001--2014 Juergen Reuter % -% -% LilyPond is free software: you can redistribute it and/or modify +% The LilyPond font is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by % the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. +% (at your option) any later version, or under the SIL Open Font License. % % LilyPond is distributed in the hope that it will be useful, % but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -126,9 +125,7 @@ enddef; fet_beginchar ("Ed. Vat. do clef", "vaticana.do"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_vaticana_do_clef ((0, 0), 1.0); fet_endchar; @@ -195,9 +192,7 @@ enddef; fet_beginchar ("Ed. Vat. fa clef", "vaticana.fa"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_vaticana_fa_clef ((0, 0), 1.0); fet_endchar; @@ -283,9 +278,7 @@ enddef; fet_beginchar ("Ed. Med. do clef", "medicaea.do"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_medicaea_do_clef ((0, 0), 1.0); fet_endchar; @@ -353,9 +346,7 @@ enddef; fet_beginchar ("Ed. Med. fa clef", "medicaea.fa"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_medicaea_fa_clef ((0, 0), 1.0); fet_endchar; @@ -443,6 +434,7 @@ def draw_brevis (expr exact_center, bwidth, bheight, blinethickness) = penlabels (1, 2, 3); enddef; + % % Draw two brevis notes; the second one shifted down by `shift'. % The other parameters are the same as with `draw_brevis'. @@ -521,6 +513,7 @@ def draw_double_brevis (expr exact_center, bwidth, bheight, penlabels (1, 2, 3, 4, 5, 6); enddef; + def draw_neomensural_c_clef (expr exact_center, reduction) = save reduced_il, reduced_slt, stem_width; @@ -588,9 +581,7 @@ enddef; fet_beginchar ("neo-mensural c clef", "neomensural.c"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_neomensural_c_clef ((0, 0), 1.0); fet_endchar; @@ -695,9 +686,7 @@ enddef; fet_beginchar ("petrucci c1 clef", "petrucci.c1"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), +2, 1.0); fet_endchar; @@ -708,9 +697,7 @@ fet_endchar; fet_beginchar ("petrucci c2 clef", "petrucci.c2"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), +1, 1.0); fet_endchar; @@ -721,9 +708,7 @@ fet_endchar; fet_beginchar ("petrucci c3 clef", "petrucci.c3"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), 0, 1.0); fet_endchar; @@ -734,9 +719,7 @@ fet_endchar; fet_beginchar ("petrucci c4 clef", "petrucci.c4"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), -1, 1.0); fet_endchar; @@ -747,9 +730,7 @@ fet_endchar; fet_beginchar ("petrucci c5 clef", "petrucci.c5"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), -2, 1.0); fet_endchar; @@ -761,10 +742,12 @@ fet_endchar; def draw_mensural_c_clef (expr exact_center, reduction, fill_char) = save reduced_il, vert_thick, hor_thick, blot_rad; + reduced_il# = staff_space# * reduction; vert_thick# = linethickness# * 1.4; hor_thick# = staff_space# * reduction * 0.25; - blot_rad = blot_diameter/2; + + blot_rad = blot_diameter / 2; define_pixels (reduced_il, vert_thick, hor_thick); @@ -783,64 +766,81 @@ def draw_mensural_c_clef (expr exact_center, reduction, fill_char) = x2l = 0; top y2 = 2.2 reduced_il; z3 = (vert_thick, 0.75 reduced_il); - z4 = z3 + (reduced_il-vert_thick, 0); - z5 = z4 + (vert_thick, - 0.5 reduced_il); + z4 = z3 + (reduced_il - vert_thick, 0); + z5 = z4 + (vert_thick, -0.5 reduced_il); z6 = z5 - (reduced_il, 0); z7 = z4 + (0.5 vert_thick, 0.5 reduced_il); z8 = z5 - (vert_thick, 0); + save pat, pat_mid; path pat, pat_mid; + pat = z1l - --z2l{up}..z2+(0, blot_rad)..{down}z2r - --top z3r{down}..{right}rt z3r - --lft z4r{right}..{up}top z4r - --z7l{up}..z7+(0, blot_rad)..{down}z7r - --top z5l{down}..{left}lft z5l - --rt z6l{left}..{down}bot z6l - --z1r; - pat := pat -- reverse pat yscaled -1 -- cycle; + -- z2l{up} + .. z2 + (0, blot_rad) + .. {down}z2r + -- top z3r{down} + .. {right}rt z3r + -- lft z4r{right} + .. {up}top z4r + -- z7l{up} + .. z7 + (0, blot_rad) + .. {down}z7r + -- top z5l{down} + .. {left}lft z5l + -- rt z6l{left} + .. {down}bot z6l + --z1r; + pat := pat + -- reverse pat yscaled -1 + -- cycle; fill pat; if fill_char: - pat_mid = bot z3l{up}..{right}rt z3l - --lft z4l{right}..{down}bot z4l - --top z8r{down}..{left}lft z8r - --rt z6r{left}..{up}top z6r - --cycle; + pat_mid = bot z3l{up} + .. {right}rt z3l + -- lft z4l{right} + .. {down}bot z4l + -- top z8r{down} + .. {left}lft z8r + -- rt z6r{left} + .. {up}top z6r + --cycle; unfill pat_mid; + pat_mid := pat_mid shifted (0, -reduced_il); unfill pat_mid; fi; set_char_box (0, reduced_il# + vert_thick#, - 2.2 reduced_il#, - 2.2 reduced_il#); + 2.2 reduced_il#, 2.2 reduced_il#); - penlabels (1,2,3,4,5,6,7,8); + penlabels (1, 2, 3, 4, 5, 6, 7, 8); enddef; + fet_beginchar ("mensural c clef", "mensural.c"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_mensural_c_clef ((0, 0), 1.0, true); fet_endchar; + fet_beginchar ("mensural c clef", "mensural.c_change"); draw_mensural_c_clef ((0, 0), .8, true); fet_endchar; + fet_beginchar ("black mensural c clef", "blackmensural.c"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_mensural_c_clef ((0, 0), 1.0, false); fet_endchar; + fet_beginchar ("black mensural c clef", "blackmensural.c_change"); draw_mensural_c_clef ((0, 0), 0.8, false); fet_endchar; + def draw_diamond (expr exact_center, reduction) = save stem_width, reduced_nht, holeheight, beamheight; save rh_height, rh_width; @@ -1010,9 +1010,7 @@ enddef; fet_beginchar ("petrucci f clef", "petrucci.f"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_f_clef ((0, 0), 1.0); fet_endchar; @@ -1118,9 +1116,7 @@ enddef; fet_beginchar ("mensural f clef", "mensural.f"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_mensural_f_clef ((0, 0), 1.0); fet_endchar; @@ -1350,9 +1346,7 @@ enddef; fet_beginchar ("petrucci g clef", "petrucci.g"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_g_clef ((0, 0), 1.0); fet_endchar; @@ -1384,9 +1378,7 @@ enddef; % until the code for the mensural g clef will be rewritten. % fet_beginchar ("mensural g clef", "mensural.g"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_g_clef ((0, 0), 1.0); fet_endchar; @@ -1475,9 +1467,7 @@ enddef; fet_beginchar ("Hufnagel do clef", "hufnagel.do"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_hufnagel_do_clef ((0, 0), 1.0); fet_endchar; @@ -1571,9 +1561,7 @@ enddef; fet_beginchar ("Hufnagel fa clef", "hufnagel.fa"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_hufnagel_fa_clef ((0, 0), 1.0); fet_endchar; @@ -1595,9 +1583,7 @@ enddef; fet_beginchar ("Hufnagel do/fa clef", "hufnagel.do.fa"); - if test = 1: - draw_staff (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_hufnagel_do_fa_clef ((0, 0), 1.0); fet_endchar;