X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-generic.mf;h=0d253ce653d73d859e4ed9f5ab6124be77c8389b;hb=refs%2Fheads%2Fupstream-mut;hp=c551a2298962dace8c52f6aa9deb4fb46eabcc3e;hpb=cba77bbf342a93cb022af9546146620c34be4eb5;p=lilypond.git

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index c551a22989..0d253ce653 100644
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -1,53 +1,60 @@
-% 
-% feta-generic.mf --  implement generic stuff: include lots of files, but don't
-%  set dims.
+% 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.
 %
-% source file of the Feta (defintively not an abbreviation for Font-En-Tja)
-% music font
-% 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-% 
+% Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%
+% 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, 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
+% 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/>.
 
 
 if test = -1:
 	mode := smoke;
 fi
 
+staffsize# := design_size * pt#;
+
 mode_setup;
-%
 
 input feta-macros;
 
-make_pen_stack;
-make_picture_stack;
 input feta-params;
 
-font_x_height  staff_space#;
-font_coding_scheme "feta music";
-
-if test = 0: 
-	input feta-eindelijk;
-	input feta-toevallig;
-	input feta-puntje;
-	input feta-bolletjes;
-	input feta-schrift;
-	input feta-banier;
-	input feta-klef;
-	input feta-timesig;
-	input feta-pendaal;
+font_x_height staff_space#;
+
+fet_beginfont ("feta", design_size, "fetaMusic");
+
+if test = 0:
+	input feta-rests;
+	input feta-accidentals;
+	input feta-arrowheads;
+	input feta-dots;
+	input feta-scripts;
+	input feta-clefs;
+	input feta-timesignatures;
+	input feta-pedals;
+	input feta-brackettips;
 	input feta-accordion;
-	input feta-solfa;
-	
+	input feta-ties;
 else:
-%	input feta-bolletjes;	
-%	input feta-banier;
-%	input feta-eindelijk;
-%	input feta-klef;
-	input feta-toevallig;
-	input feta-schrift;
-%	input feta-haak;
-%	input feta-timesig;
-%	input feta-pendaal;
-%	input feta-accordion;
-%	input feta-solfa;
+	input feta-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#);
+
+fet_endfont;