X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-noteheads-generic.mf;h=8a7b6e1914293ab12c7cf332a2cdceb0c991c898;hb=777a404670230b89d98210cdb3d18447c27ccc42;hp=89de7d06a2f183701fcb2b21940d4429fee47a54;hpb=89c94db7a59904e2cb7066e075049465be8ac1ac;p=lilypond.git

diff --git a/mf/feta-noteheads-generic.mf b/mf/feta-noteheads-generic.mf
index 89de7d06a2..8a7b6e1914 100644
--- a/mf/feta-noteheads-generic.mf
+++ b/mf/feta-noteheads-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
@@ -18,39 +17,13 @@
 % along with LilyPond.	If not, see <http://www.gnu.org/licenses/>.
 
 
-if test = -1:
-	mode := smoke;
-fi
-
-staffsize# := design_size * pt#;
-
-mode_setup;
-
-input feta-macros;
-
-input feta-params;
+input common-modules-and-initialization;
 
 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:
-	input feta-noteheads;
-else:
-	input feta-noteheads-test-generic.mf;
-fi
-
-autometric_parameter ("staffsize", staffsize#);
-autometric_parameter ("stafflinethickness", stafflinethickness#);
-autometric_parameter ("staff_space", staff_space#);
-autometric_parameter ("linethickness", linethickness#);
-autometric_parameter ("black_notehead_width", black_notehead_width#);
-autometric_parameter ("ledgerlinethickness", ledgerlinethickness#);
-autometric_parameter ("blot_diameter", blot_diameter#);
+input feta-noteheads;
 
+	input declare-autometric-parameters;
 fet_endfont;