resolve merge

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

diff --git a/mf/feta-params.mf b/mf/feta-params.mf
index 96d9862897c280ad5600b618e3b894d4aaed787f..4d0a5eb4b527b873f9fcbc9b75e9c5e77a30fd64 100644 (file)
--- a/mf/feta-params.mf
+++ b/mf/feta-params.mf
@@ -1,16 +1,27 @@
+% Feta (not the Font-En-Tja) music font -- global parameters for both feta and parmesan fonts
+% This file is part of LilyPond, the GNU music typesetter.
 %
-% feta-params.mf -- global parameters for both feta and parmesan fonts
+% Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %
-% source file of the GNU LilyPond music typesetter
+% 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.
 %
-% (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% 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/>.
 
 stafflines := 5;
 
 %
-% The design size of a staff should really be the 
+% The design size of a staff should really be the
 % staff_space, but we use staffsize for historical reasons.
-% 
+%
 
 staff_space# := staffsize# / (stafflines - 1);
 staff_space_rounded# := staff_space#;
@@ -31,11 +42,11 @@ fixed_line_thickness + variable_line_factor * 5 pt# = 0.50 pt#;
 fixed_line_thickness + variable_line_factor * 4.125 pt# = 0.47 pt#;
 
 stafflinethickness# := fixed_line_thickness
-                      + variable_line_factor * staff_space#; 
+                      + variable_line_factor * staff_space#;
 stafflinethickness_rounded# := stafflinethickness#;
 
 %
-% The following tunes the general blackness of the glyphs. 
+% The following tunes the general blackness of the glyphs.
 %
 
 linethickness# := stafflinethickness#;         %% 0.5 pt#;
@@ -68,7 +79,7 @@ if ledgerlinethickness_rounded > 2 stafflinethickness_rounded:
        ledgerlinethickness_rounded := 2 stafflinethickness_rounded;
 fi;
 
-% 
+%
 % Because of the engraving/stamping process, no traditional
 % characters have sharp edges and corners.
 % The following variable controls the amount of `roundness'.
@@ -151,8 +162,8 @@ define_pixels (blot_diameter);
 %   . Restore height and decrease `d' by 1.
 %
 % o The glyph is centered between two or four staff lines, and the origin is
-%   the middle of the whitespace.  Assuming that the the whitespace consists
-%   of an odd number of pixels, we have this:
+%   the middle of the whitespace.  Assuming that the whitespace consists of
+%   an odd number of pixels, we have this:
 %
 %          -----------
 %                       b