Imported Upstream version 2.14.2

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

diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf
index 92355b452118ff596a13f9d8a832ccd4ca0aca23..2f605f736adfe3cf11d1f44346b99a620affafbe 100644 (file)
--- a/mf/parmesan-clefs.mf
+++ b/mf/parmesan-clefs.mf
@@ -1,10 +1,21 @@
-% -%-Fundamental-%- -*-Metafont-*-
-% parmesan-clefs.mf -- implement ancient clefs
-% 
-% source file of LilyPond's pretty-but-neat music font
+% Feta (not the Font-En-Tja) music font --  ancient clefs
+% This file is part of LilyPond, the GNU music typesetter.
 %
-% (c) 2001--2006 Juergen Reuter <reuter@ipd.uka.de>
+% Copyright (C) 2001--2011 Juergen Reuter <reuter@ipd.uka.de>
 %
+%
+% LilyPond 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.
+%
+% LilyPond is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 fet_begingroup ("clefs");
 
@@ -304,12 +315,12 @@ def draw_medicaea_fa_clef (expr exact_center, reduction) =
        define_pixels (xoffs, yoffs);
 
        % stem
-       pickup pencircle scaled linethickness;
+       pickup pencircle scaled reduced_slt;
 
        x11 = x12 = xoffs + 0.4 reduced_il;
        y11 = yoffs = bot y12 + 1.5 reduced_il;
 
-       draw_rounded_block (bot lft z12, top rt z11, linethickness);
+       draw_rounded_block (bot lft z12, top rt z11, reduced_slt);
 
        % left-handed punctum
        save ellipse, T;
@@ -322,7 +333,7 @@ def draw_medicaea_fa_clef (expr exact_center, reduction) =
        ellipse := reverse fullcircle transformed T;
 
        lft z13 = (xoffs, yoffs);
-       rt z14 = z11 + (linethickness / 2, 0);
+       rt z14 = z11 + (reduced_slt / 2, 0);
 
        fill get_subpath (ellipse, left, right, z13)
             -- get_subpath (ellipse, right, left, z14)
@@ -1040,7 +1051,8 @@ def draw_petrucci_f_clef (expr exact_center, reduction) =
        pickup pencircle transformed T;
        ellipse := fullcircle transformed T;
 
-       rt z8 = (xoffs + reduced_il, yoffs - 4 reduced_slt);
+       rt x8 = xoffs + reduced_il;
+       y8 = y3;
        rt z9 = (xoffs + reduced_il, yoffs - 4 reduced_il);
 
        penpos8 (stem_width, 0);