Merge branch 'master' into translation

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

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 3472715e1639947541e33e846f72efd8b72f2b6e..0d253ce653d73d859e4ed9f5ab6124be77c8389b 100644 (file)
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -1,13 +1,12 @@
 % Feta (not the Font-En-Tja) music font --  generic stuff: include lots of files, but don't
 % This file is part of LilyPond, the GNU music typesetter.
 %
-% Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %
-%
-% 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
@@ -32,10 +31,6 @@ input feta-params;
 
 font_x_height staff_space#;
 
-%% this is a fallback so we can run the font without including feta-noteheads.
-black_notehead_width# := 1.0 staff_space#;
-
-
 fet_beginfont ("feta", design_size, "fetaMusic");
 
 if test = 0:
@@ -44,12 +39,12 @@ if test = 0:
        input feta-arrowheads;
        input feta-dots;
        input feta-scripts;
-       input feta-flags;
        input feta-clefs;
        input feta-timesignatures;
        input feta-pedals;
        input feta-brackettips;
        input feta-accordion;
+       input feta-ties;
 else:
        input feta-test-generic.mf;
 fi