Merge remote branch 'origin/release/unstable' into HEAD

[lilypond.git] / mf / feta-clefs.mf

diff --git a/mf/feta-clefs.mf b/mf/feta-clefs.mf
index ea360906810273880b47ec005da2f589f2d56d44..e7dca3061ad705437a14c17a338b4d4c9f995ce4 100644 (file)
--- a/mf/feta-clefs.mf
+++ b/mf/feta-clefs.mf
@@ -1,14 +1,14 @@
 % Feta (not the Font-En-Tja) music font --  implement Clefs -*-Fundamental-*-
 % This file is part of LilyPond, the GNU music typesetter.
 %
-% Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+% Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>,
 % Jan Nieuwenhuizen <janneke@gnu.org>,
 % Juergen Reuter <reuter@ipd.uka.de>
 %
-% 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
@@ -105,7 +105,7 @@ def draw_c_clef (expr reduction) =
 
        % ugh, should be bulb, not flare?
 
-       draw_staff (-2, 2, 0);
+       draw_staff_if_debugging (-2, 2);
 enddef;
 
 
@@ -270,7 +270,7 @@ def draw_bass_clef (expr exact_center, reduction) =
 
        penlabels (1, 2, 3, 4, 5, 6);
 
-       draw_staff (-3, 1, 0);
+       draw_staff_if_debugging (-3, 1);
 enddef;
 
 
@@ -482,7 +482,7 @@ def draw_gclef (expr reduction) =
        penlabels (range 101 thru 121);
        penlabels (110', 111');
 
-       draw_staff (-1, 3, 0);
+       draw_staff_if_debugging (-1, 3);
 enddef;
 
 
@@ -522,7 +522,7 @@ def draw_percussion_clef (expr reduction) =
        draw_block ((-b, -d), (-b + razt, h));
        draw_block ((w - razt, -d), (w, h));
 
-       draw_staff (-3, 1, 1);
+       draw_staff_if_debugging (-3, 1);
 enddef;
 
 
@@ -729,7 +729,7 @@ def draw_tab_clef (expr reduction) =
        draw_tab_B ((-b + .025 reduced_ss, -d),
                    (2.1 reduced_ss, letterheight), 0.25);
 
-       draw_staff (-3, 2, 0.5);
+       draw_staff_if_debugging (-3, 2);
 enddef;